Version 0.1 is officially completed!

Author: ManiMozaffar

src/services/ads/repositories.py

@@ -1,3 +1,4 @@
+import logging
 from services.common import CRUD, PaginationQuery
 from .models import Ads
 from fastapi import (
@@ -67,6 +68,8 @@ async def create(
                     message.get("chat").get("id"),
                     keywords
                 )
+            else:
+                logging.error("Task not started; keywords={keywords}") 
         return result
 
 

src/services/ads/tasks.py

@@ -2,6 +2,8 @@
 from services.tel_users.repositories import TelegramCrud
 from db import get_app_settings
 import requests
+import logging
+
 
 class AdsManager(TelegramCrud, KeyWordCrud):
     _context = None
@@ -13,7 +15,7 @@ def context(self):
         return self._context
 
     def forward_message(self, message_id, from_chat_id, ads_keywords):
-        print(ads_keywords)
+        logging.info(f"ads_keywords={ads_keywords}")
         token = get_app_settings().telegram_token
         all_related_users = self.union_related_user_tech(ads_keywords)
         for user in all_related_users:
@@ -28,12 +30,11 @@ def forward_message(self, message_id, from_chat_id, ads_keywords):
                     "from_chat_id": from_chat_id,
                     "message_id": message_id
                 }
-                print(user)
-                print(payload)
                 url = f"https://api.telegram.org/bot{token}/forwardMessage"
                 response = requests.post(url, json=payload)
-                print(response.text)
-
+                if response.status_code != 200 or not response.json(
+                ).get("ok"):
+                    logging.error(response.text)
 
 
 async def send_message_to_filtered_users(

src/services/ads/utils.py

@@ -1,6 +1,7 @@
 import requests
 from db import get_app_settings
 from typing import Union
+import logging
 
 
 def send_message_to_telegram(
@@ -23,7 +24,7 @@ def send_message_to_telegram(
         json=payload
     )
     if resp.status_code != 200 or not resp.json()["ok"]:
-        print(resp.text)
+        logging.error(resp.text)
         return None
     else:
         return resp.json()["result"]

tel/bot.py

@@ -31,7 +31,6 @@ async def is_user_a_member(message: types.Message, channel_id=channel_id):
         )
 
 
-
 @app.on_message(filters.command("show") & filters.private)
 async def show_keywords(_, message: types.Message):
     if await is_user_a_member(message):
@@ -50,6 +49,19 @@ async def show_keywords(_, message: types.Message):
         )
 
 
+@app.on_message(filters.command("info") & filters.private)
+async def get_info(_, message: types.Message):
+    if await is_user_a_member(message):
+        text = requests.get(
+            f"http://main_app:8000/api/telegram/{int(message.from_user.id)}"
+        ).json().get("result")
+        text = text[0] if len(text) == 1 else "No Query Found"
+        await message.reply_text(
+            text,
+            reply_to_message_id=message.reply_to_message_id
+        )
+
+
 @app.on_message(filters.command("start") & filters.private)
 async def welcome(_, message: types.Message):
     print("HEY!")
@@ -62,7 +74,9 @@ async def welcome(_, message: types.Message):
 Too easy! ```(django or fastapi) and (backend or (fullstack and vuejs) or (frontend and vuejs)) and germany```
 You only need 1 day of python knowledge to write your own logical expression :)
 Please use /show command to see all the possible namespaces and keywords you can filter.
-If you want to setup your filter, simply send it to me here.
+You may use /info to check your current query
+
+If you want to setup your filter, simply write it to me here.
 
 Remember, You must be a member of main channel to be able to use this bot:)
 @linkedin_python
@@ -91,8 +105,11 @@ async def start_filter(_, message: types.Message):
             )
         else:
             error = resp.get('error')
+            text = f"Your query is not done correctly, because: {error}"
+            text += "\n\nPlease write /show to see all available namspaces"
+            text += "\n or /start to see the how-to-use guide!"
             await message.reply_text(
-                f"Your query is not done correctly, because: {error}",
+                text,
                 reply_to_message_id=message.reply_to_message_id
             )
 

worker/connection.py

@@ -92,14 +92,18 @@ async def create_ads(
         await helpers.safe_fill_form(
             chatgpt_page, xpaths.GPT_FILL,
             f"""
-KEYWORDS = '''{helpers.get_all_keywords()}'''
+PROMPT: Read the the text, then follow up the instructions that is given at the end.
 
-{prompt.TAG_ADS}
+KEYWORDS = '''{helpers.get_all_keywords()}'''
 
 Job Title: {title} \n
 Country: {country} \n
 Advertisement: \n
 {body}
+
+\n \n
+{prompt.TAG_ADS}
+
             """,
             timeout=5000
         )

worker/prompt.py

@@ -54,7 +54,7 @@
 \n
 INSTRUCTIONS: \n
 1. Read the keywords that i have sent you previously on top of this text. Read the advertisement that I'll send you in below. Detect the matching keywords with keywords I have sent you at first.\n
-2. Keyword the job as one of these options: `backend` `frontend` `devops` `software` `full_stack` or if none match, then label it as `others` \n
+2. Analyze the job from job title, and match it with: `backend` `frontend` `devops` `software` `full_stack` or if none match, then label it as `others` \n
 3. DO NOT CREATE KEYWORDS ON YOUR OWN. ONLY use the provided list of KEYWORDS \n
 4. Use the exact spelling and case of the KEYWORDS provided, as they are case-sensitive. \n
 5. Analyze the KEYWORDS I have sent you carefully. They usually follow python's namespacing rules. (e.g., "c#" to "c_sharp" or ".NET" to "dot_net"). Use the version of keyword I have provided for you \n