Revert cache change

Author: Buried-In-Code

.github/workflows/testing.yaml

@@ -38,7 +38,7 @@ jobs:
       - name: Setup Python
         run: uv python install ${{ matrix.python-version }}
       - name: Install project
-        run: uv sync --dev
+        run: uv sync --group tests
       - name: Run tests
         env:
           COMICVINE__API_KEY: IGNORED

simyan/comicvine.py

@@ -178,7 +178,7 @@ def _get_request(
         cache_key = re.sub(r"(.+api_key=)(.+?)(&.+)", r"\1*****\3", cache_key)
 
         if self.cache and not skip_cache:
-            cached_response = self.cache.select(url=cache_key)
+            cached_response = self.cache.select(query=cache_key)
             if cached_response:
                 return cached_response
 
@@ -187,7 +187,7 @@ def _get_request(
             raise ServiceError(response["error"])
 
         if self.cache and not skip_cache:
-            self.cache.insert(url=cache_key, response=response)
+            self.cache.insert(query=cache_key, response=response)
 
         return response
 

simyan/schemas/issue.py

@@ -103,4 +103,12 @@ class Issue(BasicIssue):
         mode="before",
     )
     def handle_blank_list(cls, value: Union[str, list, None]) -> list:
+        """Convert a blank or None value to an empty list.
+
+        Args:
+            value: The value to check.
+
+        Returns:
+            An empty list if the value is None or an empty string, otherwise the original list.
+        """
         return value or []

simyan/sqlite_cache.py

@@ -27,53 +27,54 @@ def __init__(self, path: Optional[Path] = None, expiry: Optional[int] = 14):
         self.connection = sqlite3.connect(path or get_cache_root() / "cache.sqlite")
         self.connection.row_factory = sqlite3.Row
 
-        self.connection.execute("CREATE TABLE IF NOT EXISTS queries (url, response, query_date);")
+        self.connection.execute("CREATE TABLE IF NOT EXISTS queries (query, response, query_date);")
         self.cleanup()
 
-    def select(self, url: str) -> dict[str, Any]:
+    def select(self, query: str) -> dict[str, Any]:
         """Retrieve data from the cache database.
 
         Args:
-            url: Url string used as key.
+            query: Url string used as key.
 
         Returns:
             Empty dict or select results.
         """
         if self.expiry:
             expiry = datetime.now(tz=timezone.utc).astimezone().date() - timedelta(days=self.expiry)
             cursor = self.connection.execute(
-                "SELECT * FROM queries WHERE url = ? and query_date > ?;", (url, expiry.isoformat())
+                "SELECT * FROM queries WHERE query = ? and query_date > ?;",
+                (query, expiry.isoformat()),
             )
         else:
-            cursor = self.connection.execute("SELECT * FROM queries WHERE url = ?;", (url,))
+            cursor = self.connection.execute("SELECT * FROM queries WHERE query = ?;", (query,))
         if results := cursor.fetchone():
             return json.loads(results["response"])
         return {}
 
-    def insert(self, url: str, response: dict[str, Any]) -> None:
+    def insert(self, query: str, response: dict[str, Any]) -> None:
         """Insert data into the cache database.
 
         Args:
-            url: Url string used as key.
+            query: Url string used as key.
             response: Response dict from url.
         """
         self.connection.execute(
-            "INSERT INTO queries (url, response, query_date) VALUES (?, ?, ?);",
+            "INSERT INTO queries (query, response, query_date) VALUES (?, ?, ?);",
             (
-                url,
+                query,
                 json.dumps(response),
                 datetime.now(tz=timezone.utc).astimezone().date().isoformat(),
             ),
         )
         self.connection.commit()
 
-    def delete(self, url: str) -> None:
+    def delete(self, query: str) -> None:
         """Remove entry from the cache with the provided url.
 
         Args:
-          url: Url string used as key.
+          query: Url string used as key.
         """
-        self.connection.execute("DELETE FROM queries WHERE url = ?;", (url,))
+        self.connection.execute("DELETE FROM queries WHERE query = ?;", (query,))
         self.connection.commit()
 
     def cleanup(self) -> None: