Update app.py

app.py

@@ -2,6 +2,7 @@ import gradio as gr
 from fastmcp import FastMCP
 import logging
 import requests
+from datetime import datetime
 
 logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")
 logger = logging.getLogger(__name__)
@@ -9,11 +10,14 @@ logger = logging.getLogger(__name__)
 mcp = FastMCP("Jobicy Canada Remote Jobs Agent")
 
 @mcp.tool(name="search_jobs")
-def search_jobs_tool(query: str, location: str, limit: int = 10, salary: str = None, job_type: str = None) -> dict:
+def search_jobs_tool(query: str = "", location: str = "", limit: int = 10) -> dict:
     base_url = "https://jobicy.com/api/v2/remote-jobs"
     params = {}
+
     if query.strip():
         params["tag"] = query.strip()
+    if location.strip():
+        params["geo"] = location.strip().lower()
 
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) "
@@ -28,12 +32,12 @@ def search_jobs_tool(query: str, location: str, limit: int = 10, salary: str = N
         data = response.json()
 
         jobs_raw = data.get("jobs", [])
+
         jobs = []
-        for job in jobs_raw[:limit]:
+        for job in jobs_raw:
             salary_min = job.get("annualSalaryMin")
             salary_max = job.get("annualSalaryMax")
             currency = job.get("salaryCurrency", "")
-            # 判斷salary有無實際數值（排除0或None）
             if salary_min and salary_min != 0 and salary_max and salary_max != 0:
                 salary_str = f"{salary_min} - {salary_max} {currency}".strip()
             else:
@@ -48,7 +52,18 @@ def search_jobs_tool(query: str, location: str, limit: int = 10, salary: str = N
                 "salary": salary_str
             })
 
-        logger.info(f"Found {len(jobs)} jobs from Jobicy.")
+        # 排序：由新到舊，嘗試用 pubDate ISO 格式解析，失敗排後面
+        def parse_date(job):
+            try:
+                return datetime.fromisoformat(job["pubDate"].replace("Z", "+00:00"))
+            except Exception:
+                return datetime.min
+
+        jobs.sort(key=parse_date, reverse=True)
+
+        jobs = jobs[:limit]
+
+        logger.info(f"Found {len(jobs)} jobs from Jobicy after sorting.")
         return {"jobs": jobs}
 
     except requests.exceptions.HTTPError as http_err:
@@ -64,21 +79,18 @@ def search_jobs_tool(query: str, location: str, limit: int = 10, salary: str = N
         logger.error(f"Unexpected error: {str(e)}")
         return {"error": f"Unexpected error: {str(e)}"}
 
-def search_jobs_ui(query, location, limit=10, salary=None, job_type=None):
-    if not query:
-        return "❌ Please provide a job title or keyword to search for."
-
+def search_jobs_ui(query="", location="", limit=10):
     limit = int(max(1, min(limit, 50)))
-    result = search_jobs_tool(query, location, limit, salary, job_type)
+    result = search_jobs_tool(query, location, limit)
 
     if "error" in result:
         return f"❌ Error: {result['error']}"
 
     jobs = result.get("jobs", [])
     if not jobs:
-        return "No jobs found for your search. Try different keywords."
+        return "No jobs found for your search. Try different keywords or location."
 
-    output = "# Jobicy Canada Remote Job Search Results\n\n"
+    output = "# Jobicy Remote Job Search Results\n\n"
     for i, job in enumerate(jobs, 1):
         output += (
             f"### {i}. {job['title']}\n"
@@ -88,21 +100,23 @@ def search_jobs_ui(query, location, limit=10, salary=None, job_type=None):
             f"**Posted On**: {job['pubDate']}\n"
             f"[Apply Here]({job['url']})\n\n"
         )
-
     return output
 
+country_choices = [
+    "", "canada", "united states", "united kingdom", "australia", "germany", "france", "india"
+    # 你可以再加多啲國家，或係由API提供清單動態生成
+]
+
 app = gr.Interface(
     fn=search_jobs_ui,
     inputs=[
-        gr.Textbox(label="Job Title / Keyword", placeholder="e.g., Software Engineer"),
-        gr.Textbox(label="Location (ignored)", placeholder="Any, e.g., Toronto, ON"),
+        gr.Textbox(label="Job Title / Keyword (optional)", placeholder="e.g., Software Engineer"),
+        gr.Dropdown(label="Country (optional)", choices=country_choices, value="", interactive=True),
         gr.Slider(minimum=1, maximum=50, value=10, step=1, label="Number of Results"),
-        gr.Textbox(label="Salary (optional, ignored)", placeholder="Not used"),
-        gr.Textbox(label="Job Type (optional, ignored)", placeholder="Not used")
     ],
     outputs=gr.Markdown(),
-    title="Jobicy Canada Remote Job Search",
-    description="Search remote jobs in Canada using Jobicy API with FastMCP and Gradio.",
+    title="Jobicy Remote Job Search",
+    description="Search remote jobs by optional job title and country, sorted by most recent postings.",
     theme="huggingface"
 )