Update '.drone.yml'

Reviewed-on: #4
Reviewed-by: gav <a@a.aa>

.drone.yml

@@ -1,10 +1,59 @@
+# ---
+# kind: pipeline
+# type: docker
+# name: deploy-to-docker-vm
+# clone:
+#   disable: true
+
+# steps:
+# - name: greeting
+#   image: appleboy/drone-ssh
+#   settings:
+#     host:
+#       from_secret: docker_host
+#     username:
+#       from_secret: docker_user
+#     key:
+#       from_secret: docker_privkey
+#     port: 2200
+#     script:
+#     - whoami
+#     - uname -a
+#     - mkdir -p deploy; cd deploy
+#     - git clone https://gitea.gavt45.ru/gav/es-bot.git
+#     - cd es-bot
+#     - git checkout main
+#     - docker-compose build
+#   when:
+#     branch:
+#       - main 
+
+# ---
+# kind: pipeline
+# type: docker
+# name: test-secrets-pipeline
+
+# steps:
+# - name: test-secrets
+#   image: alpine
+#   environment:
+#     HOST:
+#       from_secret: docker_host
+#   commands:
+#   - env
 kind: pipeline
 type: docker
 name: default
 
 steps:
-- name: greeting
-  image: alpine
-  commands:
-  - echo hello
-  - echo world
+  - name: docker
+    image: plugins/docker
+    settings:
+      auto_tag: true
+      auto_tag_suffix: kek
+      registry: registry.gavt45.ru
+      username:
+        from_secret: docker_username
+      password:
+        from_secret: docker_password
+      repo: registry.gavt45.ru/es-bot

.gitattributes

@@ -0,0 +1,2 @@
+*.png filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -2,3 +2,5 @@
 tmp
 .env
 docker-compose-dev.yml
+*.DS_Store*
+.idea/

locales.py

@@ -102,9 +102,11 @@ FAV_THEME = "Какая школьная дисциплина нравится
 FAV_THEME_KB = Keyboard()
 FAV_THEME_KB.add_text_button(text="Математика", payload={"q": "Математика"}, color=ButtonColor.PRIMARY)
 FAV_THEME_KB.add_text_button(text="Русский/Литература", payload={"q": "русскийлитра"}, color=ButtonColor.PRIMARY)
-FAV_THEME_KB.add_text_button(text="Информатика/программирование", payload={"q": "Инфа"}, color=ButtonColor.PRIMARY)
 FAV_THEME_KB.add_row()
+FAV_THEME_KB.add_text_button(text="Информатика/программирование", payload={"q": "Инфа"}, color=ButtonColor.PRIMARY)
 FAV_THEME_KB.add_text_button(text="Физика", payload={"q": "Физика"}, color=ButtonColor.PRIMARY)
+FAV_THEME_KB.add_row()
+FAV_THEME_KB.add_text_button(text="История/обществознание", payload={"q": "Инфа"}, color=ButtonColor.PRIMARY)
 FAV_THEME_KB.add_text_button(text="Другой", payload={"q": "other"}, color=ButtonColor.PRIMARY)
 
 # 4
@@ -131,7 +133,7 @@ ZODIAC = "Кто вы по знаку зодиака?"
 # CONTACT = "Введите почту или ник в телеграмме, по которому мы сможем прислать вам результаты"
 
 # last
-LAST_MESSAGE = "Теперь у вас есть ваш персональный NFT-талисман! Он поможет вам при сдаче экзаменов и поступлении в желаемый ВУЗ 🌟"
+LAST_MESSAGE = "Теперь у вас есть ваш персональный NFT-талисман! Он поможет вам при сдаче экзаменов и поступлении в желаемый университет 🌟"
 LAST_MESSAGE_KB = Keyboard()
 LAST_MESSAGE_KB.add_text_button(text="Вернуться на главную", payload={}, color=ButtonColor.POSITIVE)
 

nft_svc/app.py

@@ -1,34 +1,14 @@
 import io
 import random
+import os
 
 from PIL import Image
 from flask import Flask, request, jsonify
 import matplotlib.image as mpimg
-import numpy as np
-import numba
-import pickle
 import base64
 
 app = Flask(__name__)
-
-
-@numba.njit
-def optimized_mandelbrot(n_rows, n_columns, iterations, cx, cy):
-    x_cor = np.linspace(-2, 2, n_rows)
-    y_cor = np.linspace(-2, 2, n_columns)
-    output = np.zeros((n_rows,n_columns))
-    c = cx + 1j * cy
-    for i in range(n_rows):
-        for j in range(n_columns):
-            z = x_cor[i] + y_cor[j] * 1j
-            count = 0
-            for k in range(iterations):
-                z = (z*z) + c
-                count += 1
-                if np.abs(z) > 4:
-                    break
-            output[i, j] = count
-    return output.T
+IMAGE_PATH = 'pics'
 
 
 def open_image_as_array(path):
@@ -36,23 +16,24 @@ def open_image_as_array(path):
 
 
 def get_encoded_img(arr):
-    img = Image.fromarray(arr).convert("L")
+    img = Image.fromarray(arr)
     img_byte_arr = io.BytesIO()
     img.save(img_byte_arr, format='PNG')
     encoded_img = base64.encodebytes(img_byte_arr.getvalue()).decode('ascii')
-    return encoded_img
+    return str(encoded_img)
 
 
 @app.route('/getImage', methods=['GET'])
 def get_image():
-    with open('data_100.pickle', 'rb') as f:
-        images = pickle.load(f)
-    buffered = io.BytesIO()
-    random.choice(images).save(buffered, format="JPEG")
-    img_str = base64.b64encode(buffered.getvalue())
+    # print(random.choice(os.listdir(IMAGE_PATH)))
+    file = os.path.join(IMAGE_PATH, random.choice(os.listdir(IMAGE_PATH)))
+    # buffered = io.BytesIO()
+    # image.save(buffered, format="JPEG")
+    # img_str = base64.b64encode(buffered.getvalue())
+    image = base64.encodebytes(open(file, 'rb').read()).decode('ascii')
     return jsonify({
         "code": 0,
-        "image": str(img_str.decode('ascii')),
+        "image": image,
         "first_time": 1
     })