fix & cleanup

JobDescription.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+import json
 
 class JobDescription:
     def __init__(self, title, company, url, company_url, job_description):
@@ -9,17 +10,17 @@ class JobDescription:
         self.published_at = None  # Initialize to None or a default value
         self.job_description = job_description
         self.organization_logo_url = ""
-        self.ai_result = {}
+        self.ai_result : AIInformation = None
         self.salary_range = ""
     
-    def format_should_apply(self, should_apply):
+    def format_should_apply(self, should_apply : bool):
         if should_apply:
             return "⭐ "
         return ""
     
     def get_salary(self):
-        if self.ai_result["salary_range"].lower() not in ["", "unknown"]:
-            return self.ai_result["salary_range"]
+        if self.ai_result.salary_range.lower() not in ["", "unknown"]:
+            return self.ai_result.salary_range
         return self.salary_range
     
     def format_str_or_list(self, input):
@@ -43,14 +44,41 @@ class JobDescription:
         result.append("<div class='logobox'><img src='{}' alt='No logo' class='logo'></div>".format(self.organization_logo_url))
         #text part
         result.append("<div style='flex: 5; padding: 10px;'>")
-        result.append("<h3><a href='{}' target='_blank'>{}{}</a></h3>".format(self.url, self.format_should_apply(self.ai_result["should_apply"]), self.title))
-        result.append("<p><a href='{}' target='_blank'>{}</a> ({}) - published at {}</p>".format(self.company_url, self.company, self.ai_result["company_description"], self.format_posted_date(self.published_at)))
-        result.append("<p><h4>Position: {}</h4>{}</p>".format(self.get_salary(), self.format_str_or_list(self.ai_result["position_summary"])))
-        result.append("<p><h4>Language:</h4>{}</p>".format(self.format_str_or_list(self.ai_result["language_requirements"])))
-        result.append("<p><h4>Experience:</h4>{}</p>".format(self.format_str_or_list(self.ai_result["experience_requirements"])))
+        result.append("<h3><a href='{}' target='_blank'>{}{}</a></h3>".format(self.url, self.format_should_apply(self.ai_result.should_apply), self.title))
+        result.append("<p><a href='{}' target='_blank'>{}</a> ({}) - published at {}</p>".format(self.company_url, self.company, self.ai_result.company_description, self.format_posted_date(self.published_at)))
+        result.append("<p><h4>Position: {}</h4>{}</p>".format(self.get_salary(), self.format_str_or_list(self.ai_result.position_summary)))
+        result.append("<p><h4>Language:</h4>{}</p>".format(self.format_str_or_list(self.ai_result.language_requirements)))
+        result.append("<p><h4>Experience:</h4>{}</p>".format(self.format_str_or_list(self.ai_result.experience_requirements)))
         #close text part
         result.append("</div>")
         #close box
         result.append("</div>")
         return " ".join(result)
     
+class AIInformation:
+    def __init__(self, json_dump):
+        obj = json.loads(json_dump)
+        print(obj)
+        #Check result
+        if not "company_description" in obj:
+            obj["company_description"] = ""
+        if not "position_summary" in obj:
+            obj["position_summary"] = ""
+        if not "language_requirements" in obj:
+            obj["language_requirements"] = ""
+        if not "experience_requirements" in obj:
+            obj["experience_requirements"] = ""
+        if not "is_an_internship" in obj:
+            obj["is_an_internship"] = False
+        if not "salary_range" in obj:
+            obj["salary_range"] = ""
+        if not "should_apply" in obj:
+            obj["should_apply"] = True
+
+        self.company_description = obj["company_description"]
+        self.position_summary = obj["position_summary"]
+        self.language_requirements = obj["language_requirements"]
+        self.experience_requirements = obj["experience_requirements"]
+        self.is_an_internship = obj["is_an_internship"]
+        self.salary_range = obj["salary_range"]
+        self.should_apply : bool = obj["should_apply"]

ai_manager.py

@@ -1,5 +1,6 @@
 from mistralai import Mistral, SDKError
 from time import sleep
+from JobDescription import AIInformation
 import json
 import os
 
@@ -41,7 +42,7 @@ def _call_ai(prompt, json_mode):
 
     return chat_response.choices[0].message.content
 
-def get_extra_information(company, offer):
+def get_extra_information(company, offer) -> AIInformation:
     try:
         return _get_extra_information(company, offer)
     except json.decoder.JSONDecodeError as e:
@@ -51,7 +52,7 @@ def get_extra_information(company, offer):
         # Throw the error if it's not an SDKError
         raise
 
-def _get_extra_information(company, offer):
+def _get_extra_information(company, offer) -> AIInformation:
     prompt = """This is a job offer from the company '{}', make a JSON with this information:
 - company_description (string): a description of the company in less than 15 words. 
 - position_summary (string): a summary of the role in 3 bullet points
@@ -77,22 +78,5 @@ Example:
 Offer:
 {}""".format(company, offer)
     result = call_ai(prompt, True)
-    obj = json.loads(result)
-    print(obj)
-    #Check result
-    if not "company_description" in obj:
-        obj["company_description"] = ""
-    if not "position_summary" in obj:
-        obj["position_summary"] = ""
-    if not "language_requirements" in obj:
-        obj["language_requirements"] = ""
-    if not "experience_requirements" in obj:
-        obj["experience_requirements"] = ""
-    if not "is_an_internship" in obj:
-        obj["is_an_internship"] = False
-    if not "salary_range" in obj:
-        obj["salary_range"] = ""
-    if not "should_apply" in obj:
-        obj["should_apply"] = True
-    
-    return obj
+    return AIInformation(json_dump=result)
+    

app.py

@@ -12,7 +12,7 @@ def html_format_page(jobs : List[JobDescription]):
     result = ["<html><head><style>.job{display: flex;width:70%;margin: 5px auto;border: 1px solid;border-radius: 5px;}.logobox{flex: 1;display: flex;align-items: center;justify-content: center;}.logo{width:100px;height:100px}h4{margin: 2px;}</style></head><body>"]
     if len(jobs) > 0:
         for job in jobs:
-            if not "is_an_internship" in job.ai_result or job.ai_result["is_an_internship"] == False:
+            if job.ai_result.is_an_internship == False:
                 result.append(job.to_html())
     else:
         result.append("No job found")