Update dependencies and add dual investment support

.github/workflows/kubot-app.yml

@@ -16,10 +16,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.8
+    - name: Set up Python 3.13
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.13
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.gitignore

@@ -1,8 +1,9 @@
 config/config
 venv
+certs
 .idea
 .pytest_cache
 __pycache__
 .vscode/settings.json
 kubot_*
-*.html
+*.html

Dockerfile

@@ -1,8 +1,8 @@
-FROM python:3.8-alpine as base
+FROM python:3.13-alpine as base
 
 RUN pip install --upgrade pip
 
-RUN apk --update add gcc musl-dev postgresql-dev
+RUN apk --update add gcc musl-dev postgresql-dev git
 
 COPY . /app
 WORKDIR /app

Makefile

@@ -27,10 +27,10 @@ build-dev: ## build kubot development docker image
 	docker build --target development --tag ${image}:${version} .
 	docker image prune -f
 
-compose-dev: ## compose and start kubot suite in development mode
+compose-dev: gen-certs ## compose and start kubot suite in development mode
 	KUBOT_IMAGE=${image} KUBOT_VERSION=${version} docker-compose up -d
 
-development: ## start kubot database and gui
+development: gen-certs ## start kubot database and gui
 	KUBOT_IMAGE=${image} KUBOT_VERSION=${version} docker-compose up -d postgres grafana
 
 run-d: ## run kubot docker image detached
@@ -44,9 +44,13 @@ run: ## run kubot docker image attached
 venv: ## bootstrap python3 venv
 	@test -d "venv" || python3 -m venv venv
 
+gen-certs: ## generate grafana certs
+	@mkdir -p certs
+	@openssl req -x509 -newkey rsa:2048 -keyout certs/grafana.key -out certs/grafana.crt -days 365 -nodes -subj "/CN=localhost"
+
 install: venv ## install kubot dependencies
 	@source venv/bin/activate; \
-	pip install --upgrade pip setuptools==57.5.0; \
+	pip install --upgrade pip setuptools==75.6.0; \
 	LIBRARY_PATH=$LIBRARY_PATH:/opt/homebrew/opt/openssl/lib pip install -r requirements.txt;
 
 test: venv ## run pytest suite

config/config.demo

@@ -10,6 +10,9 @@ minimum_rate = 0.0005
 charge = 0.00005
 interval = 300
 currencies = [{"currency": "USDT", "term": 28, "reserved_amount": 10}]
+symbols = ["ETH-USDT", "ETH-BTC"]
+category_currency = ["DUAL"]
+mode = DUAL
 
 [pushover]
 user_key = user_key

docker-compose.yml

@@ -33,8 +33,13 @@ services:
     restart: on-failure:10
     depends_on:
       - postgres
+    environment:
+      - GF_SERVER_PROTOCOL=https
+      - GF_SERVER_CERT_FILE=/etc/grafana/certs/grafana.crt
+      - GF_SERVER_CERT_KEY=/etc/grafana/certs/grafana.key
     volumes:
       - grafana-storage:/var/lib/grafana
+      - ./certs:/etc/grafana/certs:ro
       - ./provisioning:/etc/grafana/provisioning
     ports:
       - 3000:3000