Final fixes to passing

Author: interestng

medkit/client.py

@@ -124,7 +124,7 @@ async def search(self, query: str) -> SearchResults:
             trials = []
 
         latency = time.time() - start_time
-        metadata = SearchMetadata(query_time=latency, sources=sources)
+        metadata = SearchMetadata(query_time=latency, sources=sources, cached=False)
 
         return SearchResults(
             drugs=drugs, papers=papers, trials=trials, metadata=metadata
@@ -328,7 +328,7 @@ def search(self, query: str) -> SearchResults:
             trials = []
 
         latency = time.time() - start_time
-        metadata = SearchMetadata(query_time=latency, sources=sources)
+        metadata = SearchMetadata(query_time=latency, sources=sources, cached=False)
 
         return SearchResults(
             drugs=drugs, papers=papers, trials=trials, metadata=metadata

medkit/providers/clinicaltrials.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, cast
 
 import httpx
 
@@ -28,7 +28,7 @@ def capabilities(self) -> list[str]:
     def get_sync(self, item_id: str) -> ClinicalTrial:
         url = f"{self.BASE_URL}/{item_id}"
         try:
-            response = self.http_client.get(url, headers=self._get_headers())
+            response = cast(httpx.Client, self.http_client).get(url, headers=self._get_headers())
             response.raise_for_status()
             # Wrap in studies list for parsing
             data = {"studies": [response.json()]}
@@ -40,7 +40,7 @@ def get_sync(self, item_id: str) -> ClinicalTrial:
     async def get(self, item_id: str) -> ClinicalTrial:
         url = f"{self.BASE_URL}/{item_id}"
         try:
-            response = await self.http_client.get(url, headers=self._get_headers())
+            response = await cast(httpx.AsyncClient, self.http_client).get(url, headers=self._get_headers())
             response.raise_for_status()
             data = {"studies": [response.json()]}
             results = self._parse_response(data)
@@ -64,12 +64,12 @@ def search_sync(self, query: str, **kwargs) -> list[ClinicalTrial]:
         recruiting = kwargs.get("recruiting")
         params = {"query.cond": query, "pageSize": limit}
         try:
-            response = self.http_client.get(
+            response = cast(httpx.Client, self.http_client).get(
                 self.BASE_URL,
                 params=params,
                 headers=self._get_headers(),
                 follow_redirects=True,
-            )  # type: ignore
+            )
             response.raise_for_status()
             return self._parse_response(response.json(), recruiting)
         except httpx.HTTPError as e:
@@ -80,12 +80,12 @@ async def search(self, query: str, **kwargs) -> list[ClinicalTrial]:
         recruiting = kwargs.get("recruiting")
         params = {"query.cond": query, "pageSize": limit}
         try:
-            response = await self.http_client.get(
+            response = await cast(httpx.AsyncClient, self.http_client).get(
                 self.BASE_URL,
                 params=params,
                 headers=self._get_headers(),
                 follow_redirects=True,
-            )  # type: ignore
+            )
             response.raise_for_status()
             return self._parse_response(response.json(), recruiting)
         except httpx.HTTPError as e:

medkit/providers/openfda.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, cast
 
 import httpx
 
@@ -28,7 +28,7 @@ async def get(self, item_id: str) -> DrugInfo:
     def search_sync(self, query: str, **kwargs) -> DrugInfo:
         search_query = f'openfda.brand_name:"{query}" openfda.generic_name:"{query}"'
         try:
-            response = self.http_client.get(  # type: ignore
+            response = cast(httpx.Client, self.http_client).get(
                 self.BASE_URL, params={"search": search_query, "limit": 1}
             )
             response.raise_for_status()
@@ -45,7 +45,7 @@ def search_sync(self, query: str, **kwargs) -> DrugInfo:
     async def search(self, query: str, **kwargs) -> DrugInfo:
         search_query = f'openfda.brand_name:"{query}" openfda.generic_name:"{query}"'
         try:
-            response = await self.http_client.get(  # type: ignore
+            response = await cast(httpx.AsyncClient, self.http_client).get(
                 self.BASE_URL, params={"search": search_query, "limit": 1}
             )
             response.raise_for_status()

medkit/providers/pubmed.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, cast
 
 import httpx
 
@@ -22,7 +22,7 @@ def capabilities(self) -> list[str]:
 
     def get_sync(self, item_id: str) -> ResearchPaper:
         try:
-            response = self.http_client.get(
+            response = cast(httpx.Client, self.http_client).get(
                 self.SUMMARY_URL,
                 params={"db": "pubmed", "id": item_id, "retmode": "json"},
             )
@@ -36,7 +36,7 @@ def get_sync(self, item_id: str) -> ResearchPaper:
 
     async def get(self, item_id: str) -> ResearchPaper:
         try:
-            response = await self.http_client.get(
+            response = await cast(httpx.AsyncClient, self.http_client).get(
                 self.SUMMARY_URL,
                 params={"db": "pubmed", "id": item_id, "retmode": "json"},
             )
@@ -51,7 +51,7 @@ async def get(self, item_id: str) -> ResearchPaper:
     def search_sync(self, query: str, **kwargs) -> list[ResearchPaper]:
         limit = kwargs.get("limit", 10)
         try:
-            search_response = self.http_client.get(  # type: ignore
+            search_response = cast(httpx.Client, self.http_client).get(
                 self.SEARCH_URL,
                 params={
                     "db": "pubmed",
@@ -66,7 +66,7 @@ def search_sync(self, query: str, **kwargs) -> list[ResearchPaper]:
             if not pmids:
                 return []
 
-            summary_response = self.http_client.get(  # type: ignore
+            summary_response = cast(httpx.Client, self.http_client).get(
                 self.SUMMARY_URL,
                 params={"db": "pubmed", "id": ",".join(pmids), "retmode": "json"},
             )
@@ -78,7 +78,7 @@ def search_sync(self, query: str, **kwargs) -> list[ResearchPaper]:
     async def search(self, query: str, **kwargs) -> list[ResearchPaper]:
         limit = kwargs.get("limit", 10)
         try:
-            search_response = await self.http_client.get(  # type: ignore
+            search_response = await cast(httpx.AsyncClient, self.http_client).get(
                 self.SEARCH_URL,
                 params={
                     "db": "pubmed",
@@ -93,7 +93,7 @@ async def search(self, query: str, **kwargs) -> list[ResearchPaper]:
             if not pmids:
                 return []
 
-            summary_response = await self.http_client.get(  # type: ignore
+            summary_response = await cast(httpx.AsyncClient, self.http_client).get(
                 self.SUMMARY_URL,
                 params={"db": "pubmed", "id": ",".join(pmids), "retmode": "json"},
             )