scraper2-hj3415 2.3.0__tar.gz → 2.4.1__tar.gz

{scraper2_hj3415-2.3.0 → scraper2_hj3415-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scraper2-hj3415
-Version: 2.3.0
+Version: 2.4.1
 Summary: Naver WiseReport scraper
 Keywords: example,demo
 Author-email: Hyungjin Kim <hj3415@gmail.com>

{scraper2_hj3415-2.3.0 → scraper2_hj3415-2.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "scraper2-hj3415"                          # PyPI 이름 (하이픈 허용)
-version = "2.3.0"
+version = "2.4.1"
 description = "Naver WiseReport scraper"
 readme = "README.md"
 requires-python = ">=3.11"

{scraper2_hj3415-2.3.0 → scraper2_hj3415-2.4.1}/src/scraper2/app/composition.py

@@ -112,21 +112,11 @@ class Usecases:
     browser_factory: Optional[BrowserFactoryPort] = None
 
     async def aclose(self) -> None:
-        # 1) playwright 먼저 닫기 (subprocess 정리)
         if self.browser_factory is not None:
-            close = getattr(self.browser_factory, "aclose", None)
-            if callable(close):
-                await close()
+            await self.browser_factory.aclose()
 
-        # 2) mongo 닫기
         if self.mongo is not None:
-            close = getattr(self.mongo, "close", None)
-            if callable(close):
-                out = close()
-                if hasattr(out, "__await__"):
-                    await out
-
-
+            await self.mongo.close()
 
 # -------------------------
 # builders
@@ -202,11 +192,13 @@ def build_usecases(
     if sink_kind == "memory":
         bundle = build_memory_bundle()
         ingest = build_ingest_usecases(fetch=fetch, sinks=bundle.sinks)
-        return Usecases(fetch=fetch, ingest=ingest, sinks=bundle.sinks, store=bundle.store)
+        return Usecases(fetch=fetch, ingest=ingest, sinks=bundle.sinks, store=bundle.store,
+            browser_factory=factory)
 
     if sink_kind == "mongo":
         bundle = build_mongo_bundle()
         ingest = build_ingest_usecases(fetch=fetch, sinks=bundle.sinks)
-        return Usecases(fetch=fetch, ingest=ingest, sinks=bundle.sinks, mongo=bundle.mongo, db=bundle.db)
+        return Usecases(fetch=fetch, ingest=ingest, sinks=bundle.sinks, mongo=bundle.mongo, db=bundle.db,
+            browser_factory=factory)
 
     raise ValueError(f"Unknown sink_kind: {sink_kind}")

{scraper2_hj3415-2.3.0 → scraper2_hj3415-2.4.1}/src/scraper2/main.py

@@ -33,16 +33,6 @@ app.add_typer(mi_app, name="mi")
 def _endpoint_list(ep: Endpoint) -> list[str]:
     return ["c101", "c103", "c104", "c106", "c108"] if ep == "all" else [ep]
 
-
-async def _maybe_await_close(obj: Any) -> None:
-    close = getattr(obj, "close", None)
-    if close is None:
-        return
-    out = close()
-    if asyncio.iscoroutine(out):
-        await out
-
-
 async def _mongo_bootstrap(db) -> None:
     from db2.nfs import ensure_indexes
     from db2.settings import get_settings
@@ -233,11 +223,7 @@ def nfs_one(
                 else:
                     typer.echo(_dto_to_pretty(dto))
         finally:
-            close = getattr(ucs, "aclose", None)
-            if callable(close):
-                await close()
-            elif getattr(ucs, "mongo", None) is not None:
-                await _maybe_await_close(ucs.mongo)
+            await ucs.aclose()
 
     asyncio.run(_run())
 
@@ -284,11 +270,7 @@ def nfs_all(
                 progress_every=1,   # chunk마다
             )
         finally:
-            close = getattr(ucs, "aclose", None)
-            if callable(close):
-                await close()
-            elif getattr(ucs, "mongo", None) is not None:
-                await _maybe_await_close(ucs.mongo)
+            await ucs.aclose()
 
     asyncio.run(_run())