Merge 9d8ff54 into e39c92e

Author: CoolCoderCarl

.dockerignore

@@ -17,7 +17,6 @@ README.md
 LICENSE
 
 # Configuration
-requirements.txt
 changelog.json
 settings.toml
 *.db

.github/workflows/publish.yaml

@@ -54,21 +54,9 @@ jobs:
             See changes: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
 
   build:
-    name: Build packages
-    runs-on: ${{ matrix.os }}
+    name: Build docker image
+    runs-on: ubuntu-latest
     needs: prepare
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            SERVICENAME: news_db
-            CONTAINERFILE: Containerfile-db
-          - os: ubuntu-latest
-            SERVICENAME: truth_seeker
-            CONTAINERFILE: Containerfile-ts
-          - os: ubuntu-latest
-            SERVICENAME: datapath
-            CONTAINERFILE: Containerfile-dp
 
     steps:
 
@@ -87,8 +75,8 @@ jobs:
         with:
           context: .
           push: true
-          file: ${{ matrix.CONTAINERFILE }}
-          tags: h0d0user/${{ matrix.SERVICENAME }}:${{ needs.prepare.outputs.get_current_tag }}
+          file: Containerfile
+          tags: h0d0user/datapath:${{ needs.prepare.outputs.get_current_tag }}
 
       - name: Notify if failure
         if: ${{ failure() }}
@@ -126,8 +114,6 @@ jobs:
 
             Branch: ${{ github.ref }}
 
-            <b>Pushed image:</b> <code>docker pull h0d0user/news_db:${{ needs.prepare.outputs.get_current_tag }}</code>,
-            <code>docker pull h0d0user/truth_seeker:${{ needs.prepare.outputs.get_current_tag }}</code>,
-            <code>docker pull h0d0user/datapath:${{ needs.prepare.outputs.get_current_tag }}</code>
+            <b>Pushed image:</b> <code>docker pull h0d0user/datapath:${{ needs.prepare.outputs.get_current_tag }}</code>
 
             See changes: https://github.com/${{ github.repository }}/commit/${{ github.sha }}

.github/workflows/release.yaml

@@ -99,19 +99,7 @@ jobs:
   build:
     name: Build packages
     needs: [ prepare, release ]
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        include:
-          - os: ubuntu-latest
-            SERVICENAME: news_db
-            CONTAINERFILE: Containerfile-db
-          - os: ubuntu-latest
-            SERVICENAME: truth_seeker
-            CONTAINERFILE: Containerfile-ts
-          - os: ubuntu-latest
-            SERVICENAME: datapath
-            CONTAINERFILE: Containerfile-dp
+    runs-on: ubuntu-latest
 
     steps:
 
@@ -130,8 +118,8 @@ jobs:
         with:
           context: .
           push: true
-          file: ${{ matrix.CONTAINERFILE }}
-          tags: h0d0user/${{ matrix.SERVICENAME }}:latest
+          file: Containerfile
+          tags: h0d0user/datapath:latest
 
       - name: Notify if failure
         if: ${{ failure() }}
@@ -169,9 +157,7 @@ jobs:
 
             Branch: ${{ github.ref }}
 
-            <b>Pushed image:</b> <code>docker pull h0d0user/news_db:latest</code>,
-            <code>docker pull h0d0user/truth_seeker:latest</code>,
-            <code>docker pull h0d0user/datapath:latest</code>
+            <b>Pushed image:</b> <code>docker pull h0d0user/datapath:latest</code>
             See changes: https://github.com/${{ github.repository }}/commit/${{ github.sha }}
 
             <b>Release URL:</b> https://github.com/${{ github.repository }}/releases/tag/${{ needs.prepare.outputs.get_current_tag }}

Containerfile

@@ -0,0 +1,18 @@
+# FROM python:3.9-alpine as builder
+FROM h0d0user/emperor_pandas:latest as builder
+
+WORKDIR /opt/
+
+COPY ["datapath.py", "/opt/"]
+COPY ["dynaconfig.py", "/opt/"]
+
+COPY requirements.txt requirements.txt
+
+RUN pip3 install -U pip
+RUN pip3 install --no-cache-dir -r requirements.txt
+RUN apt update -y && \
+    apt install curl jq -y
+
+FROM builder
+
+CMD ["python3.9", "datapath.py"]

Containerfile-db

@@ -5,7 +5,6 @@
 import requests
 
 import dynaconfig
-import news_db
 
 # Time range for sending messages loaded from settings.toml
 TIME_TO_SEND_START = dynaconfig.settings["TIMINIGS"]["TIME_TO_SEND_START"]
@@ -28,6 +27,17 @@
 API_URL = f"https://api.telegram.org/bot{API_TOKEN}/sendMessage"
 CHAT_ID = dynaconfig.settings["TELEGRAM"]["CHAT_ID"]
 
+NEWS_DB_API_URL = dynaconfig.settings["DB"]["DB_API_URL"]
+
+
+def check_api_available() -> bool:
+    try:
+        logging.info(f"Try to connect to API, URL: {NEWS_DB_API_URL}/healthcheck")
+        time.sleep(1)
+        return requests.get(f"{NEWS_DB_API_URL}/healthcheck").ok
+    except (ConnectionError, ConnectionRefusedError) as con_err:
+        logging.error(con_err)
+
 
 def send_news_to_telegram(message):
     """
@@ -40,15 +50,15 @@ def send_news_to_telegram(message):
             API_URL,
             json={
                 "chat_id": CHAT_ID,
-                "text": f"Author: {message[0]}\n"
+                "text": f"Author: {message['author']}\n"
                 f"\n"
-                f"Title: {message[1]}\n"
+                f"Title: {message['title']}\n"
                 f"\n"
-                f"{message[2]}\n"
+                f"{message['description']}\n"
                 f"\n"
-                f"URL: {message[3]}\n"
+                f"URL: {message['url']}\n"
                 f"\n"
-                f"Date published: {message[4]}\n",
+                f"Date published: {message['pub_date']}\n",
             },
         )
         if response.status_code == 200:
@@ -64,14 +74,13 @@ def send_news_to_telegram(message):
 
 
 if __name__ == "__main__":
-    db_connection = news_db.create_connection(news_db.DB_FILE)
     while True:
-        if db_connection:
+        if check_api_available():
             time.sleep(1)
             current_time = datetime.now().strftime("%H:%M")
             if TIME_TO_SEND_START < current_time < TIME_TO_SEND_END:
                 logging.info("Time to send news has come !")
-                data_from_db = news_db.send_all_news(db_connection)
+                data_from_db = requests.get(NEWS_DB_API_URL).json()
                 if len(data_from_db) == 0:
                     logging.warning("Database is empty !")
                 else:
@@ -83,4 +92,4 @@ def send_news_to_telegram(message):
             else:
                 logging.info("Still waiting to send.")
         else:
-            logging.error("Connection to db is not exist !")
+            logging.error("API is not available !")

Containerfile-dp

@@ -1,39 +1,46 @@
 version: '3'
 
 services:
-  news_db:
-    container_name: news_db
-    image: h0d0user/news_db:latest
+  attainments_sanctuary:
+    container_name: attainments_sanctuary
+    image: h0d0user/attainments_sanctuary:latest
     pull_policy: always
     restart: always
-    network_mode: host
-    volumes:
-      - "shared-volume:/mnt/"
-      - "./settings.toml:/opt/settings.toml"
+    networks:
+      - etl
+    ports:
+      - "8888:8888"
+#    healthcheck:
+#      test: "curl http://attainments_sanctuary:8888/healthcheck | jq -r '.healthcheck'"
+#      interval: 5s
+#      timeout: 5s
+#      retries: 20
+#      start_period: 5s
 
-  truth_seeker:
-    container_name: truth_seeker
-    image: h0d0user/truth_seeker:latest
+  epistolary:
+    container_name: epistolary
+    image: h0d0user/epistolary:latest
     pull_policy: always
     restart: always
-    network_mode: host
+    networks:
+      - etl
+    hostname: epistolary
     depends_on:
-      - "news_db"
+      - "attainments_sanctuary"
     volumes:
-      - "shared-volume:/mnt/"
       - "./settings.toml:/opt/settings.toml"
 
   datapath:
     container_name: datapath
     image: h0d0user/datapath:latest
     pull_policy: always
     restart: always
-    network_mode: host
+    networks:
+      - etl
     depends_on:
-      - "news_db"
+      - "attainments_sanctuary"
     volumes:
-      - "shared-volume:/mnt/"
       - "./settings.toml:/opt/settings.toml"
 
-volumes:
-  shared-volume:
+networks:
+  etl: