Fixed the opportunities search (#25)

* Fixed the opportunities search
* Bumped the version

Author: vdavez

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "procurement-tools"
-version = "0.2.1"
+version = "0.2.2"
 description = "Python tools for navigating federal contracting"
 authors = ["V. David Zvenyach <dave@tandemgov.com>"]
 readme = "README.md"

src/procurement_tools/cli/main.py

@@ -35,25 +35,23 @@ def entity(uei: str):
 def opportunities(
     *,
     q: str = "",
-    postedFrom: Optional[
-        str
-    ] = None,  # (datetime.now() - timedelta(days=364)).strftime("%Y-%m-%d"),
-    postedTo: Optional[str] = None,  # datetime.now().strftime("%Y-%m-%d"),
+    updatedFrom: Optional[str] = None,
+    updatedTo: Optional[str] = None,
     active: str = "true",
     mode: str = "ALL",
+    notice_type: Optional[str] = None
 ):
     """Get SAM opportunities' JSON data"""
-    params = {
-        "q": q,
-        "active": active,
-        "mode": mode,
-    }
-    if postedFrom:
-        params["modified_date.from"] = (postedFrom + "-06:00",)
-    if postedTo:
-        params["modified_date.to"] = (postedTo + "-06:00",)
-
-    res = SAM.get_opportunities(params)
+    res = SAM.get_opportunities(
+        dict(
+            q=q,
+            is_active=active,
+            mode=mode,
+            postedFrom=updatedFrom,
+            postedTo=updatedTo,
+            notice_type=notice_type,
+        )
+    )
     print(json.dumps(res))
 
 

src/procurement_tools/models/opportunities.py

@@ -42,7 +42,21 @@ class SetAsideEnum(str, Enum):
     vss = "Veteran-Owned Small Business Sole source (specific to Department of Veterans Affairs)"
 
 
+class modeEnum(str, Enum):
+    any_mode = "ANY"
+    exact_mode = "EXACT"
+    all_mode = "ALL"
+
+
 class OpportunitiesRequestParams(BaseModel):
+    q: str = None
+    is_active: str = Field(default="true", alias="active")
+    qMode: modeEnum = Field(default="ALL", description="query mode", alias="q_mode")
+    postedFrom: Optional[str]
+    postedTo: Optional[str]
+
+
+class APIOpportunitiesRequestParams(BaseModel):
     ptype: Optional[PtypeEnum] = None
     solnum: Optional[str] = Field(description="Solicitation Number", default=None)
     noticeid: Optional[str] = Field(description="Notice ID", default=None)

src/procurement_tools/sam.py

@@ -1,5 +1,8 @@
 from .models.entity import Entity
-from .models.opportunities import OpportunitiesRequestParams
+from .models.opportunities import (
+    OpportunitiesRequestParams,
+    APIOpportunitiesRequestParams,
+)
 from .uei import UEI
 from datetime import date, timedelta
 import httpx
@@ -96,10 +99,15 @@ def get_opportunities(params: dict) -> dict:
         seed = "".join(choice(digits) for i in range(13))
         mode = params.get("mode", "ALL")
         active = params.get("active", "true")
-        BASE_URL = f"https://sam.gov/api/prod/sgs/v1/search/?random={seed}&index=opp&page=0&sort=-modifiedDate&size=1000&mode=search&responseType=json&qMode={mode}&is_active={active}"
-
-        param_str = urlencode(params)
-        url = f"{BASE_URL}&{param_str}"
+        url = f"https://sam.gov/api/prod/sgs/v1/search/?random={seed}&index=opp&page=0&sort=-modifiedDate&size=1000&mode=search&responseType=json&qMode={mode}&is_active={active}"
+
+        if mod_from_date := params.get("postedFrom"):
+            url += f"&modified_date.from={mod_from_date}-06:00"
+        if mod_to_date := params.get("postedTo"):
+            url += f"&modified_date.from={mod_to_date}-06:00"
+        url += f"&q={params.get('q')}"
+        if notice_type := params.get("notice_type"):
+            url += f"&notice_type={notice_type}"
         res = httpx.get(url)
         data = res.json()
         return data
@@ -114,14 +122,14 @@ def get_api_opportunities(params: dict) -> dict:
 
         Args:
             params: A dict for the request parameters to the SAM API. As currently implemented, we use \
-            OpportunitiesRequestParams to check whether the parameters are valid.
+            APIOpportunitiesRequestParams to check whether the parameters are valid.
 
         Returns:
             A dict
         """
 
         try:
-            request_params = OpportunitiesRequestParams(**params).model_dump(
+            request_params = APIOpportunitiesRequestParams(**params).model_dump(
                 exclude_none=True
             )
         except ValidationError: