mk test in test because test

.gitignore

@@ -24,3 +24,6 @@ doc/pw-inventory/square_inventory_export_2025-06-18-0137.xlsx
 square-src.code-workspace
 
 doc/pw-inventory/
+
+edderkop.db-journal
+.venv

src/abricksetapi.py

@@ -53,7 +53,7 @@ class AsyncBricksetAPI:
                     self.logger.info("Successfully authenticated with Brickset API")
                 return result
 
-    async def get_set(self, set_number: str) -> Dict[str, Any]:
+    async def get_set(self, set_number: int) -> Dict[str, Any]:
         """
         Fetch LEGO set information asynchronously
 
@@ -72,6 +72,7 @@ class AsyncBricksetAPI:
             "userHash": self.user_hash,
             "params": json.dumps({"setNumber": f"{set_number}-1"}),
         }
+        print(f"[@DEBUG] {params}...")
 
         async with aiohttp.ClientSession() as session:
             async with session.get(

src/asquare.py

@@ -120,28 +120,6 @@ async def acat2id(cat_id: str):
 
     return items
 
-async def do_review() -> bool:
-    result = await acat2id(LEGO_CAT_ID)
-    for item in result:
-        if not re.match(r".*\d{5}.*", item["name"]):
-            missing = []
-            print(f"{item} is missing its set number!")
-            print(f"[@DEBUG] Upserting {item['id']} into REVIEW table")
-            item_sanitized = {
-                "sq_object": item["id"],
-                "set_name": item["name"],
-                "set_number": None,
-                "time_added": time
-            }
-            missing.append(item_sanitized)
-    for item in missing:
-        sq_item = await db.fetch(item["id"])  #
-        if item["id"] != sq_item["sq_object"]:
-            await db.upsert("REVIEW", item_sanitized, "sq_object")
-            print(f"[@DEBUG] Upserted {item['id']} into REVIEW table")
-        print(f"[@DEBUG] {item['id']} already in REVIEW table")
-    return True
-
 
 async def test() -> None:
     task = asyncio.create_task(acat2id(LEGO_CAT_ID))  # type: ignore
@@ -162,7 +140,6 @@ async def test() -> None:
 
 
 if __name__ == "__main__":
-    print("Spooling up..")
     print(f"@[DEBUG] ENV:\t{ENVIRONMENT}")
     print(f"@[DEBUG] CATID:\t{LEGO_CAT_ID}")
     asyncio.run(test())

src/db.py

@@ -3,7 +3,11 @@ from time import time
 time = int(time())  # we dont need no stinkin floats
 
 # db = await aiosqlite.connect("edderkop.db")  # type: ignore
-async def fetch(sqobj):
+
+async def close(db):
+    await db.close()
+
+async def fetch(table, sqobj):
     """
     Asynchronously fetch a record from the REVIEW table by sq_object.
 
@@ -13,21 +17,17 @@ async def fetch(sqobj):
         dict or None: The fetched record as a dictionary, or None if not found.
     """
     async with aiosqlite.connect("edderkop.db") as db:  # type: ignore
-        db.row_factory = aiosqlite.Row  # type: ignore
+        async with db.execute(f"SELECT * FROM {table} WHERE sq_object = {sqobj}") as cursor:
-        async with db.execute(
+            async for row in cursor:
-            "SELECT * FROM REVIEW WHERE sq_object = ?", (sqobj,)
+                return row
-        ) as cursor:
-            row = await cursor.fetchone()
-            if row:
-                return dict(row)
-            return None
 
-async def upsert(table: str, data: dict, unique_key: str) -> None:
+    return None
+
+async def upsert(table: str, data: dict, unique_key: str) -> bool:
     """
     Asynchronously insert or update a record in the specified table.
 
     Args:
-        sq_ib (aiosqlite.Connection): The SQLite database connection.
         table (str): The name of the table to upsert into.
         data (dict): A dictionary of column-value pairs to insert or update.
         unique_key (str): The column name that serves as the unique key for upsert.
@@ -50,4 +50,4 @@ async def upsert(table: str, data: dict, unique_key: str) -> None:
     async with aiosqlite.connect("edderkop.db") as db:  # type: ignore
         async with db.execute(sql, tuple(data.values())) as cursor:
             await db.commit()
-            #await db.close()
+    return True

src/glue.py

@@ -0,0 +1,32 @@
+import asyncio
+import json
+import get_sq_env
+import aiosqlite
+
+import asquare
+import db
+import abricksetapi
+from . throttler import GlobalThrottler
+
+async def do_review() -> bool:
+    result = await asquare.acat2id(LEGO_CAT_ID)
+    for item in result:
+        if not re.match(r".*\d{5}.*", item["name"]):
+            missing = []
+            print(f"{item} is missing its set number!")
+            print(f"[@DEBUG] Upserting {item['id']} into REVIEW table")
+            item_sanitized = {
+                "sq_object": item["id"],
+                "set_name": item["name"],
+                "set_number": None,
+                "time_added": time
+            }
+            missing.append(item_sanitized)
+    for item in missing:
+        sq_item = await db.fetch(item["id"])  #
+        if item["id"] != sq_item["sq_object"]:
+            await db.upsert("REVIEW", item_sanitized, "sq_object")
+            print(f"[@DEBUG] Upserted {item['id']} into REVIEW table")
+        print(f"[@DEBUG] {item['id']} already in REVIEW table")
+    return True
+

src/test_server.py

@@ -11,8 +11,8 @@ import re
 import logging
 from logging.handlers import RotatingFileHandler
 from pathlib import Path
-print("Creating log directory if it doesn't exist...")
+#print("Creating log directory if it doesn't exist...")
-Path("./logs/").mkdir(parents=True, exist_ok=True)
+#Path("./logs/").mkdir(parents=True, exist_ok=True)
 
 import banner
 import get_sq_env
@@ -47,7 +47,18 @@ UA = re.compile(r"^kopling\/?", re.IGNORECASE)
 
 async def run_update():
     set_list = await sq.acat2id(SQUARE_LEGO_CAT_ID)
-    print(f"[@DEBUG]\t {set_list}")  # type: ignore
+    #print(f"[@DEBUG]\t {set_list}")  # type: ignore
+    for l_set in set_list:
+        #print(f"[@DEBUG]{l_set}")
+        try:
+            l_setinfo = await lego.throttled_get_set(l_set["number"])
+            print(f"[@DEBUG] Found {l_setinfo["pw_name"]}")
+        except Exception as e:
+            print(f"Error fetching set\t: {l_set}: {str(e)}")
+            continue
+
+        #print(f"[@DEBUG]{l_setinfo}")
+        #await sq.update_itm(l_set, l_setinfo)
     """for l_set in set_list:
         print(f"[@DEBUG]{l_set}")
         try:

src/throttler.py

@@ -0,0 +1,33 @@
+import asyncio
+from asyncio_throttle import Throttler as AsyncThrottler
+
+class GlobalThrottler:
+    _instance = None
+    _lock = asyncio.Lock()
+    
+    def __init__(self, rate_limit: int = 500, period: int = 60) -> None:
+        if not hasattr(self, '_initialized'):
+            self.rate_limit = rate_limit
+            self.period = period
+            self.throttler = AsyncThrottler(rate_limit=self.rate_limit, period=self.period)
+            self._initialized = True
+    
+    @classmethod
+    async def get_instance(cls, rate_limit: int = 500, period: int = 60) -> 'GlobalThrottler':
+        async with cls._lock:
+            if not cls._instance:
+                cls._instance = cls(rate_limit, period)
+            return cls._instance
+    
+    async def acquire(self):
+        await self.throttler.acquire()
+        
+    def release(self):
+        self.throttler.release()
+    
+    async def __aenter__(self):
+        await self.acquire()
+        return self
+        
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        self.release()

tests/test.py

@@ -1,6 +1,6 @@
-import src.libsquare as sq
+import src.libsquare as sq
-import src.bricksetapi as lego
+import src.bricksetapi as lego
-
+
-oursq = sq.get_itm("71417")
+oursq = sq.get_itm("71417")
-ourlego = lego.get_set(71417)
+ourlego = lego.get_set(71417)
-print(f"{oursq}\n\n{ourlego}\n\n")
+print(f"{oursq}\n\n{ourlego}\n\n")