Update app.py

app.py

@@ -1,5 +1,3 @@
-# app.py
-
 import streamlit as st
 import requests
 from langchain_groq import ChatGroq
@@ -14,9 +12,6 @@ from streamlit_option_menu import option_menu
 import fitz  # PyMuPDF
 from bs4 import BeautifulSoup
 
-# -------------------------------
-# API Key Retrieval
-# -------------------------------
 
 GROQ_API_KEY = st.secrets["GROQ_API_KEY"]
 RAPIDAPI_KEY = st.secrets["RAPIDAPI_KEY"]
@@ -24,9 +19,6 @@ YOUTUBE_API_KEY = st.secrets["YOUTUBE_API_KEY"]
 THE_MUSE_API_KEY = st.secrets.get("THE_MUSE_API_KEY", "") 
 BLS_API_KEY = st.secrets.get("BLS_API_KEY", "")  
 
-# -------------------------------
-# Initialize Language Model
-# -------------------------------
 
 llm = ChatGroq(
     temperature=0,
@@ -34,9 +26,7 @@ llm = ChatGroq(
     model_name="llama-3.1-70b-versatile"
 )
 
-# -------------------------------
-# Function Definitions
-# -------------------------------
+
 
 @st.cache_data(ttl=3600)
 def extract_text_from_pdf(pdf_file):
@@ -359,44 +349,51 @@ def fetch_muse_jobs_api(job_title, location=None, category=None, max_results=50)
         st.error(f"Error fetching jobs from The Muse: {e}")
         return []
 
-# Indeed API Integration
+# Indeed API Integration using /list and /get
 @st.cache_data(ttl=86400)  # Cache results for 1 day
-def fetch_indeed_jobs_api(job_title, location="CA", sort="-1", page_size=50):
+def fetch_indeed_jobs_list_api(job_title, location="United States", distance="1.0", language="en_GB", remoteOnly="false", datePosted="month", employmentTypes="fulltime;parttime;intern;contractor", index=0, page_size=10):
     """
-    Fetches job listings from Indeed API based on user preferences.
+    Fetches a list of job IDs from Indeed API based on user preferences.
 
     Args:
-        job_title (str): The job title to search for (e.g., "Front end developer").
-        location (str, optional): The country code (e.g., "CA" for Canada). Defaults to "CA".
-        sort (str, optional): Sorting parameter (e.g., "-1" for relevance). Defaults to "-1".
-        page_size (int, optional): Number of results per page. Defaults to 50.
+        job_title (str): The job title to search for.
+        location (str, optional): The job location. Defaults to "United States".
+        distance (str, optional): Search radius in miles. Defaults to "1.0".
+        language (str, optional): Language code. Defaults to "en_GB".
+        remoteOnly (str, optional): "true" or "false". Defaults to "false".
+        datePosted (str, optional): e.g., "month". Defaults to "month".
+        employmentTypes (str, optional): e.g., "fulltime;parttime;intern;contractor". Defaults to "fulltime;parttime;intern;contractor".
+        index (int, optional): Pagination index. Defaults to 0.
+        page_size (int, optional): Number of jobs to fetch. Defaults to 10.
 
     Returns:
-        list: A list of job dictionaries.
+        list: A list of job IDs.
     """
-    url = "https://indeed46.p.rapidapi.com/job"
-
-    # Encode job title to handle spaces and special characters
-    encoded_job_title = re.sub(r'\s+', '+', job_title.strip())
+    url = "https://jobs-api14.p.rapidapi.com/list"
 
     querystring = {
-        "country": location,
-        "sort": sort,
-        "page_size": str(page_size),
-        "title": encoded_job_title  # Assuming the API accepts a 'title' parameter for job titles
+        "query": job_title,
+        "location": location,
+        "distance": distance,
+        "language": language,
+        "remoteOnly": remoteOnly,
+        "datePosted": datePosted,
+        "employmentTypes": employmentTypes,
+        "index": str(index),
+        "page_size": str(page_size)
     }
 
     headers = {
-        "x-rapidapi-key": RAPIDAPI_KEY,  # Ensure RAPIDAPI_KEY is set in .streamlit/secrets.toml
-        "x-rapidapi-host": "indeed46.p.rapidapi.com"
+        "x-rapidapi-key": RAPIDAPI_KEY,
+        "x-rapidapi-host": "jobs-api14.p.rapidapi.com"
     }
 
     try:
         response = requests.get(url, headers=headers, params=querystring)
-        response.raise_for_status()  # Raises HTTPError for bad responses (4xx or 5xx)
+        response.raise_for_status()
         data = response.json()
-        jobs = data.get("data", [])
-        return jobs
+        job_ids = [job["id"] for job in data.get("jobs", [])]
+        return job_ids
     except requests.exceptions.HTTPError as http_err:
         if response.status_code == 400:
             st.error("❌ Bad Request: Please check the parameters you're sending.")
@@ -414,6 +411,52 @@ def fetch_indeed_jobs_api(job_title, location="CA", sort="-1", page_size=50):
         st.error(f"❌ An unexpected error occurred: {e}")
         return []
 
+@st.cache_data(ttl=86400)  # Cache results for 1 day
+def fetch_indeed_job_details_api(job_id, language="en_GB"):
+    """
+    Fetches job details from Indeed API based on job ID.
+
+    Args:
+        job_id (str): The job ID.
+        language (str, optional): Language code. Defaults to "en_GB".
+
+    Returns:
+        dict: Job details.
+    """
+    url = "https://jobs-api14.p.rapidapi.com/get"
+
+    querystring = {
+        "id": job_id,
+        "language": language
+    }
+
+    headers = {
+        "x-rapidapi-key": RAPIDAPI_KEY,
+        "x-rapidapi-host": "jobs-api14.p.rapidapi.com"
+    }
+
+    try:
+        response = requests.get(url, headers=headers, params=querystring)
+        response.raise_for_status()
+        job_details = response.json()
+        return job_details
+    except requests.exceptions.HTTPError as http_err:
+        if response.status_code == 400:
+            st.error("❌ Bad Request: Please check the job ID and parameters.")
+        elif response.status_code == 403:
+            st.error("❌ Access Forbidden: Check your API key and permissions.")
+        elif response.status_code == 404:
+            st.error("❌ Job Not Found: Verify the job ID.")
+        else:
+            st.error(f"❌ HTTP error occurred: {http_err}")
+        return {}
+    except requests.exceptions.RequestException as req_err:
+        st.error(f"❌ Request Exception: {req_err}")
+        return {}
+    except Exception as e:
+        st.error(f"❌ An unexpected error occurred: {e}")
+        return {}
+
 def recommend_indeed_jobs(user_skills, user_preferences):
     """
     Recommends jobs from Indeed API based on user skills and preferences.
@@ -426,19 +469,30 @@ def recommend_indeed_jobs(user_skills, user_preferences):
         list: Recommended job listings.
     """
     job_title = user_preferences.get("job_title", "")
-    country = user_preferences.get("location_country", "CA")
-    category = user_preferences.get("category")
+    location = user_preferences.get("location", "United States")
+    category = user_preferences.get("category", "")
+    language = "en_GB"
 
-    jobs = fetch_indeed_jobs_api(job_title, country, sort="-1", page_size=50)
+    # Fetch job IDs
+    job_ids = fetch_indeed_jobs_list_api(job_title, location=location, category=category, page_size=5)  # Limiting to 5 for API call count
 
-    # Simple matching based on skills appearing in job description
     recommended_jobs = []
-    for job in jobs:
-        job_description = job.get("description", "").lower()
-        match_score = sum(skill.lower() in job_description for skill in user_skills)
-        if match_score > 0:
-            recommended_jobs.append((match_score, job))
+    api_calls_needed = len(job_ids)  # Each /get call counts as one
 
+    # Check if enough API calls are left
+    if not can_make_api_calls(api_calls_needed):
+        st.error("❌ You have reached your monthly API request limit. Please try again next month.")
+        return []
+
+    for job_id in job_ids:
+        job_details = fetch_indeed_job_details_api(job_id, language=language)
+        if job_details and not job_details.get("hasError", True):
+            job_description = job_details.get("description", "").lower()
+            match_score = sum(skill.lower() in job_description for skill in user_skills)
+            if match_score > 0:
+                recommended_jobs.append((match_score, job_details))
+                decrement_api_calls(1)
+    
     # Sort jobs based on match_score
     recommended_jobs.sort(reverse=True, key=lambda x: x[0])
 
@@ -546,6 +600,97 @@ def display_bls_data(series_id, title):
     fig = px.line(df, x="Year", y="Value", title=series_title, markers=True)
     st.plotly_chart(fig, use_container_width=True)
 
+# -------------------------------
+# API Usage Counter Functions
+# -------------------------------
+
+def init_api_usage_db():
+    """
+    Initializes the SQLite database and creates the api_usage table if it doesn't exist.
+    """
+    conn = sqlite3.connect('applications.db')
+    c = conn.cursor()
+    c.execute('''
+        CREATE TABLE IF NOT EXISTS api_usage (
+            id INTEGER PRIMARY KEY AUTOINCREMENT,
+            count INTEGER,
+            last_reset DATE
+        )
+    ''')
+    # Check if a row exists, if not, initialize
+    c.execute('SELECT COUNT(*) FROM api_usage')
+    if c.fetchone()[0] == 0:
+        # Initialize with 25 requests and current date
+        c.execute('INSERT INTO api_usage (count, last_reset) VALUES (?, ?)', (25, datetime.now().date()))
+    conn.commit()
+    conn.close()
+
+def get_api_usage():
+    """
+    Retrieves the current API usage count and last reset date.
+
+    Returns:
+        tuple: (count, last_reset_date)
+    """
+    conn = sqlite3.connect('applications.db')
+    c = conn.cursor()
+    c.execute('SELECT count, last_reset FROM api_usage WHERE id = 1')
+    row = c.fetchone()
+    conn.close()
+    if row:
+        return row[0], datetime.strptime(row[1], "%Y-%m-%d").date()
+    else:
+        return 25, datetime.now().date()
+
+def reset_api_usage():
+    """
+    Resets the API usage count to 25 and updates the last reset date.
+    """
+    conn = sqlite3.connect('applications.db')
+    c = conn.cursor()
+    c.execute('UPDATE api_usage SET count = ?, last_reset = ? WHERE id = 1', (25, datetime.now().date()))
+    conn.commit()
+    conn.close()
+
+def can_make_api_calls(requests_needed):
+    """
+    Checks if there are enough API calls remaining.
+
+    Args:
+        requests_needed (int): Number of API calls required.
+
+    Returns:
+        bool: True if allowed, False otherwise.
+    """
+    count, last_reset = get_api_usage()
+    today = datetime.now().date()
+    if today >= last_reset + timedelta(days=30):
+        reset_api_usage()
+        count, last_reset = get_api_usage()
+    if count >= requests_needed:
+        return True
+    else:
+        return False
+
+def decrement_api_calls(requests_used):
+    """
+    Decrements the API usage count by the number of requests used.
+
+    Args:
+        requests_used (int): Number of API calls used.
+    """
+    conn = sqlite3.connect('applications.db')
+    c = conn.cursor()
+    c.execute('SELECT count FROM api_usage WHERE id = 1')
+    row = c.fetchone()
+    if row:
+        new_count = row[0] - requests_used
+        if new_count < 0:
+            new_count = 0
+        c.execute('UPDATE api_usage SET count = ? WHERE id = 1', (new_count,))
+        conn.commit()
+    conn.close()
+
 # -------------------------------
 # Application Tracking Database Functions
 # -------------------------------
@@ -711,7 +856,32 @@ def embed_youtube_videos(video_urls, module_name):
 # Job Recommendations and BLS Integration
 # -------------------------------
 
-# Removed Adzuna-related functions as per request
+def labor_market_insights_module():
+    st.header("📈 Labor Market Insights")
+
+    st.write("""
+    Gain valuable insights into the current labor market trends, employment rates, and industry growth to make informed career decisions.
+    """)
+
+    # Define BLS Series IDs based on desired data
+    # Example: Unemployment rate (Series ID: LNS14000000)
+    # Reference: https://www.bls.gov/web/laus/laumstrk.htm
+    unemployment_series_id = "LNS14000000"  # Unemployment Rate
+    employment_series_id = "CEU0000000001"  # Total Employment
+
+    # Display Unemployment Rate
+    display_bls_data(unemployment_series_id, "Unemployment Rate (%)")
+
+    # Display Total Employment
+    display_bls_data(employment_series_id, "Total Employment")
+
+    # Additional Insights
+    st.subheader("💡 Additional Insights")
+    st.write("""
+    - **Industry Growth:** Understanding which industries are growing can help you target your job search effectively.
+    - **Salary Trends:** Keeping an eye on salary trends ensures that you negotiate effectively and align your expectations.
+    - **Geographical Demand:** Some regions may have higher demand for certain roles, guiding your location preferences.
+    """)
 
 # -------------------------------
 # Page Functions
@@ -931,6 +1101,7 @@ def application_tracking_dashboard():
 
     # Initialize database
     init_db()
+    init_api_usage_db()
 
     # Form to add a new application
     st.subheader("➕ Add New Application")