Indeed country support (#38)

src/jobspy/scrapers/__init__.py

@@ -1,4 +1,4 @@
-from ..jobs import Enum, BaseModel, JobType, JobResponse
+from ..jobs import Enum, BaseModel, JobType, JobResponse, Country
 from typing import List, Optional, Any
 
 
@@ -18,6 +18,7 @@ class ScraperInput(BaseModel):
     search_term: str
 
     location: str = None
+    country: Optional[Country] = Country.USA
     distance: Optional[int] = None
     is_remote: bool = False
     job_type: Optional[JobType] = None
@@ -35,9 +36,8 @@ class CommonResponse(BaseModel):
 
 
 class Scraper:
-    def __init__(self, site: Site, url: str):
+    def __init__(self, site: Site):
         self.site = site
-        self.url = url
 
     def scrape(self, scraper_input: ScraperInput) -> JobResponse:
         ...

src/jobspy/scrapers/indeed/__init__.py

@@ -1,6 +1,8 @@
 import re
 import math
+import io
 import json
+import traceback
 from datetime import datetime
 from typing import Optional
 
@@ -18,7 +20,7 @@ from ...jobs import (
     JobResponse,
     JobType,
 )
-from .. import Scraper, ScraperInput, Site, StatusException
+from .. import Scraper, ScraperInput, Site, Country, StatusException
 
 
 class ParsingException(Exception):
@@ -31,8 +33,7 @@ class IndeedScraper(Scraper):
         Initializes IndeedScraper with the Indeed job search url
         """
         site = Site(Site.INDEED)
-        url = "https://www.indeed.com"
-        super().__init__(site, url)
+        super().__init__(site)
 
         self.jobs_per_page = 15
         self.seen_urls = set()
@@ -47,16 +48,21 @@ class IndeedScraper(Scraper):
         :param session:
         :return: jobs found on page, total number of jobs found for search
         """
+        self.country = scraper_input.country
+        domain = self.country.domain_value
+        self.url = f"https://{domain}.indeed.com"
 
         job_list = []
 
         params = {
             "q": scraper_input.search_term,
             "l": scraper_input.location,
-            "radius": scraper_input.distance,
             "filter": 0,
             "start": 0 + page * 10,
         }
+        if scraper_input.distance:
+            params["radius"] = scraper_input.distance
+
         sc_values = []
         if scraper_input.is_remote:
             sc_values.append("attr(DSQF7)")
@@ -65,12 +71,15 @@ class IndeedScraper(Scraper):
 
         if sc_values:
             params["sc"] = "0kf:" + "".join(sc_values) + ";"
-        response = session.get(self.url + "/jobs", params=params)
+        response = session.get(self.url + "/jobs", params=params, allow_redirects=True)
+        # print(response.status_code)
 
-        if response.status_code != 200 and response.status_code != 307:
+        if response.status_code not in range(200, 400):
             raise StatusException(response.status_code)
 
         soup = BeautifulSoup(response.content, "html.parser")
+        with open("text2.html", "w", encoding="utf-8") as f:
+            f.write(str(soup))
         if "did not match any jobs" in str(soup):
             raise ParsingException("Search did not match any jobs")
 
@@ -92,8 +101,6 @@ class IndeedScraper(Scraper):
             if job_url in self.seen_urls:
                 return None
 
-            snippet_html = BeautifulSoup(job["snippet"], "html.parser")
-
             extracted_salary = job.get("extractedSalary")
             compensation = None
             if extracted_salary:
@@ -118,11 +125,12 @@ class IndeedScraper(Scraper):
             date_posted = date_posted.strftime("%Y-%m-%d")
 
             description = self.get_description(job_url, session)
-            li_elements = snippet_html.find_all("li")
-            if description is None and li_elements:
-                description = " ".join(li.text for li in li_elements)
+            with io.StringIO(job["snippet"]) as f:
+                soup = BeautifulSoup(f, "html.parser")
+                li_elements = soup.find_all("li")
+                if description is None and li_elements:
+                    description = " ".join(li.text for li in li_elements)
 
-            first_li = snippet_html.find("li")
             job_post = JobPost(
                 title=job["normTitle"],
                 description=description,
@@ -130,6 +138,7 @@ class IndeedScraper(Scraper):
                 location=Location(
                     city=job.get("jobLocationCity"),
                     state=job.get("jobLocationState"),
+                    country=self.country,
                 ),
                 job_type=job_type,
                 compensation=compensation,
@@ -138,7 +147,7 @@ class IndeedScraper(Scraper):
             )
             return job_post
 
-        with ThreadPoolExecutor(max_workers=10) as executor:
+        with ThreadPoolExecutor(max_workers=1) as executor:
             job_results: list[Future] = [
                 executor.submit(process_job, job)
                 for job in jobs["metaData"]["mosaicProviderJobCardsModel"]["results"]
@@ -166,7 +175,7 @@ class IndeedScraper(Scraper):
             #: get first page to initialize session
             job_list, total_results = self.scrape_page(scraper_input, 0, session)
 
-            with ThreadPoolExecutor(max_workers=10) as executor:
+            with ThreadPoolExecutor(max_workers=1) as executor:
                 futures: list[Future] = [
                     executor.submit(self.scrape_page, scraper_input, page, session)
                     for page in range(1, pages_to_process + 1)
@@ -188,6 +197,7 @@ class IndeedScraper(Scraper):
                 error=f"Indeed failed to parse response: {e}",
             )
         except Exception as e:
+            print(f"LinkedIn failed to scrape: {e}\n{traceback.format_exc()}")
             return JobResponse(
                 success=False,
                 error=f"Indeed failed to scrape: {e}",
@@ -215,17 +225,25 @@ class IndeedScraper(Scraper):
         jk_value = params.get("jk", [None])[0]
         formatted_url = f"{self.url}/viewjob?jk={jk_value}&spa=1"
 
-        response = session.get(formatted_url, allow_redirects=True)
+        try:
+            response = session.get(
+                formatted_url, allow_redirects=True, timeout_seconds=5
+            )
+        except requests.exceptions.Timeout:
+            print("The request timed out.")
+            return None
 
         if response.status_code not in range(200, 400):
+            print("status code not in range")
             return None
 
         raw_description = response.json()["body"]["jobInfoWrapperModel"][
             "jobInfoModel"
         ]["sanitizedJobDescription"]
-        soup = BeautifulSoup(raw_description, "html.parser")
-        text_content = " ".join(soup.get_text().split()).strip()
-        return text_content
+        with io.StringIO(raw_description) as f:
+            soup = BeautifulSoup(f, "html.parser")
+            text_content = " ".join(soup.get_text().split()).strip()
+            return text_content
 
     @staticmethod
     def get_job_type(job: dict) -> Optional[JobType]:
@@ -237,13 +255,18 @@ class IndeedScraper(Scraper):
         for taxonomy in job["taxonomyAttributes"]:
             if taxonomy["label"] == "job-types":
                 if len(taxonomy["attributes"]) > 0:
-                    job_type_str = (
-                        taxonomy["attributes"][0]["label"]
-                        .replace("-", "_")
-                        .replace(" ", "_")
-                        .upper()
-                    )
-                    return JobType[job_type_str]
+                    label = taxonomy["attributes"][0].get("label")
+                    if label:
+                        job_type_str = label.replace("-", "").replace(" ", "").lower()
+                        # print(f"Debug: job_type_str = {job_type_str}")
+                        return IndeedScraper.get_enum_from_value(job_type_str)
+        return None
+
+    @staticmethod
+    def get_enum_from_value(value_str):
+        for job_type in JobType:
+            if value_str in job_type.value:
+                return job_type
         return None
 
     @staticmethod
@@ -294,7 +317,7 @@ class IndeedScraper(Scraper):
         :param soup:
         :return: total_num_jobs
         """
-        script = soup.find("script", string=lambda t: "window._initialData" in t)
+        script = soup.find("script", string=lambda t: t and "window._initialData" in t)
 
         pattern = re.compile(r"window._initialData\s*=\s*({.*})\s*;", re.DOTALL)
         match = pattern.search(script.string)

src/jobspy/scrapers/linkedin/__init__.py

@@ -22,8 +22,8 @@ class LinkedInScraper(Scraper):
         Initializes LinkedInScraper with the LinkedIn job search url
         """
         site = Site(Site.LINKEDIN)
-        url = "https://www.linkedin.com"
-        super().__init__(site, url)
+        self.url = "https://www.linkedin.com"
+        super().__init__(site)
 
     def scrape(self, scraper_input: ScraperInput) -> JobResponse:
         """
@@ -31,6 +31,7 @@ class LinkedInScraper(Scraper):
         :param scraper_input:
         :return: job_response
         """
+        self.country = "worldwide"
         job_list: list[JobPost] = []
         seen_urls = set()
         page, processed_jobs, job_count = 0, 0, 0
@@ -104,7 +105,7 @@ class LinkedInScraper(Scraper):
                     metadata_card = job_info.find(
                         "div", class_="base-search-card__metadata"
                     )
-                    location: Location = LinkedInScraper.get_location(metadata_card)
+                    location: Location = self.get_location(metadata_card)
 
                     datetime_tag = metadata_card.find(
                         "time", class_="job-search-card__listdate"
@@ -125,7 +126,7 @@ class LinkedInScraper(Scraper):
                         job_url=job_url,
                         job_type=job_type,
                         compensation=Compensation(
-                            interval=CompensationInterval.YEARLY, currency="USD"
+                            interval=CompensationInterval.YEARLY, currency=None
                         ),
                     )
                     job_list.append(job_post)
@@ -195,17 +196,24 @@ class LinkedInScraper(Scraper):
                     employment_type = employment_type.lower()
                     employment_type = employment_type.replace("-", "")
 
-            return JobType(employment_type)
+            return LinkedInScraper.get_enum_from_value(employment_type)
 
         return text_content, get_job_type(soup)
 
     @staticmethod
-    def get_location(metadata_card: Optional[Tag]) -> Location:
+    def get_enum_from_value(value_str):
+        for job_type in JobType:
+            if value_str in job_type.value:
+                return job_type
+        return None
+
+    def get_location(self, metadata_card: Optional[Tag]) -> Location:
         """
         Extracts the location data from the job metadata card.
         :param metadata_card
         :return: location
         """
+        location = Location(country=self.country)
         if metadata_card is not None:
             location_tag = metadata_card.find(
                 "span", class_="job-search-card__location"
@@ -217,6 +225,7 @@ class LinkedInScraper(Scraper):
                 location = Location(
                     city=city,
                     state=state,
+                    country=self.country,
                 )
 
         return location

src/jobspy/scrapers/ziprecruiter/__init__.py

@@ -1,6 +1,7 @@
 import math
 import json
 import re
+import traceback
 from datetime import datetime
 from typing import Optional, Tuple
 from urllib.parse import urlparse, parse_qs
@@ -18,6 +19,7 @@ from ...jobs import (
     Location,
     JobResponse,
     JobType,
+    Country,
 )
 
 
@@ -27,8 +29,8 @@ class ZipRecruiterScraper(Scraper):
         Initializes LinkedInScraper with the ZipRecruiter job search url
         """
         site = Site(Site.ZIP_RECRUITER)
-        url = "https://www.ziprecruiter.com"
-        super().__init__(site, url)
+        self.url = "https://www.ziprecruiter.com"
+        super().__init__(site)
 
         self.jobs_per_page = 20
         self.seen_urls = set()
@@ -80,8 +82,10 @@ class ZipRecruiterScraper(Scraper):
             self.url + "/jobs-search",
             headers=ZipRecruiterScraper.headers(),
             params=params,
+            allow_redirects=True,
         )
 
+        # print(response.status_code)
         if response.status_code != 200:
             raise StatusException(response.status_code)
 
@@ -144,6 +148,7 @@ class ZipRecruiterScraper(Scraper):
                 error=f"ZipRecruiter returned status code {e.status_code}",
             )
         except Exception as e:
+            print(f"ZipRecruiter failed to scrape: {e}\n{traceback.format_exc()}")
             return JobResponse(
                 success=False,
                 error=f"ZipRecruiter failed to scrape: {e}",
@@ -181,15 +186,12 @@ class ZipRecruiterScraper(Scraper):
             description = job.find("p", {"class": "job_snippet"}).text.strip()
 
         job_type_element = job.find("li", {"class": "perk_item perk_type"})
+        job_type = None
         if job_type_element:
             job_type_text = (
                 job_type_element.text.strip().lower().replace("-", "").replace(" ", "")
             )
-            if job_type_text == "contractor":
-                job_type_text = "contract"
-            job_type = JobType(job_type_text)
-        else:
-            job_type = None
+            job_type = ZipRecruiterScraper.get_job_type_enum(job_type_text)
 
         date_posted = ZipRecruiterScraper.get_date_posted(job)
 
@@ -206,16 +208,17 @@ class ZipRecruiterScraper(Scraper):
         return job_post
 
     def process_job_js(self, job: dict) -> JobPost:
-        # Map the job data to the expected fields by the Pydantic model
         title = job.get("Title")
         description = BeautifulSoup(
             job.get("Snippet", "").strip(), "html.parser"
         ).get_text()
 
         company = job.get("OrgName")
-        location = Location(city=job.get("City"), state=job.get("State"))
+        location = Location(
+            city=job.get("City"), state=job.get("State"), country=Country.US_CANADA
+        )
         try:
-            job_type = ZipRecruiterScraper.job_type_from_string(
+            job_type = ZipRecruiterScraper.get_job_type_enum(
                 job.get("EmploymentType", "").replace("-", "_").lower()
             )
         except ValueError:
@@ -244,6 +247,7 @@ class ZipRecruiterScraper(Scraper):
             interval=CompensationInterval.YEARLY,
             min_amount=min_amount,
             max_amount=max_amount,
+            currency="USD/CAD",
         )
         save_job_url = job.get("SaveJobURL", "")
         posted_time_match = re.search(
@@ -270,17 +274,18 @@ class ZipRecruiterScraper(Scraper):
         return job_post
 
     @staticmethod
-    def job_type_from_string(value: str) -> Optional[JobType]:
-        if not value:
-            return None
+    def get_enum_from_value(value_str):
+        for job_type in JobType:
+            if value_str in job_type.value:
+                return job_type
+        return None
 
-        if value.lower() == "contractor":
-            value = "contract"
-        normalized_value = value.replace("_", "")
-        for item in JobType:
-            if item.value == normalized_value:
-                return item
-        raise ValueError(f"Invalid value for JobType: {value}")
+    @staticmethod
+    def get_job_type_enum(job_type_str: str) -> Optional[JobType]:
+        for job_type in JobType:
+            if job_type_str in job_type.value:
+                return job_type
+        return None
 
     def get_description(self, job_page_url: str) -> Tuple[Optional[str], Optional[str]]:
         """
@@ -289,11 +294,16 @@ class ZipRecruiterScraper(Scraper):
         :param session:
         :return: description or None, response url
         """
-        response = self.session.get(
-            job_page_url, headers=ZipRecruiterScraper.headers(), allow_redirects=True
-        )
-        if response.status_code not in range(200, 400):
-            return None, None
+        try:
+            response = self.session.get(
+                job_page_url,
+                headers=ZipRecruiterScraper.headers(),
+                allow_redirects=True,
+                timeout_seconds=5,
+            )
+        except requests.exceptions.Timeout:
+            print("The request timed out.")
+            return None
 
         html_string = response.content
         soup_job = BeautifulSoup(html_string, "html.parser")
@@ -375,7 +385,10 @@ class ZipRecruiterScraper(Scraper):
                 amounts.append(amount)
 
             compensation = Compensation(
-                interval=interval, min_amount=min(amounts), max_amount=max(amounts)
+                interval=interval,
+                min_amount=min(amounts),
+                max_amount=max(amounts),
+                currency="USD/CAD",
             )
 
             return compensation
@@ -399,10 +412,7 @@ class ZipRecruiterScraper(Scraper):
                 city, state = None, None
         else:
             city, state = None, None
-        return Location(
-            city=city,
-            state=state,
-        )
+        return Location(city=city, state=state, country=Country.US_CANADA)
 
     @staticmethod
     def headers() -> dict: