scraper2-hj3415 2.3.0__py3-none-any.whl → 2.4.1__py3-none-any.whl

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/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())
 

{scraper2_hj3415-2.3.0.dist-info → scraper2_hj3415-2.4.1.dist-info}/METADATA

@@ -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.dist-info → scraper2_hj3415-2.4.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 scraper2/.DS_Store,sha256=sEtRhy6uiX4PgYuHnRIsUN_QtI0jR0lSLi4kYurHsso,6148
 scraper2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scraper2/main.py,sha256=qkdepCUXBooOXgwA0eJCg66wY1HFM2iLjBVONGeEVDk,9450
+scraper2/main.py,sha256=Vwelc73P3WVbjwKFTXXA20P-nA7RoUE6hEq2oD0E2WU,8873
 scraper2/adapters/out/.DS_Store,sha256=nUqwRB5F2DM82P8BALYvDI0YoD1UbmngfSi8ukKkY7E,6148
 scraper2/adapters/out/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scraper2/adapters/out/playwright/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -22,7 +22,7 @@ scraper2/adapters/out/sinks/mongo/c104_mongo_sink.py,sha256=IicVnc2fyeBXoBbgMasB
 scraper2/adapters/out/sinks/mongo/c106_mongo_sink.py,sha256=FMdCp8WVjPwidnh7tIPUoViQWr48O16xtB34O_iCtJI,1203
 scraper2/adapters/out/sinks/mongo/c108_mongo_sink.py,sha256=eSvIRtofWvNKVPchglwL1mOw5hsKDpUfNz5EOum-H3Y,1203
 scraper2/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scraper2/app/composition.py,sha256=I3kpBntvnwuYWrTxTk-VQDXjIJuoM9vqEIApOLFphns,6820
+scraper2/app/composition.py,sha256=sJuEAPg-mQ51-0ZsXmMOuAN_whKaq1BCMWHy0uAwxMA,6572
 scraper2/app/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scraper2/app/parsing/_converters.py,sha256=z0kSL4nQnqq5w7QfJZBSbjZOLo1JhoqqDLpqlEAN4bo,1815
 scraper2/app/parsing/_normalize.py,sha256=2qqbXxTbzbuYlu7ttzQjyKgatFnwopme2b_fd0zahio,3738
@@ -56,8 +56,8 @@ scraper2/app/usecases/ingest/ingest_c103.py,sha256=T_IKs5ikckin_05FnL-dxirAW1PPa
 scraper2/app/usecases/ingest/ingest_c104.py,sha256=2rGTcFbsATsn3d2KsSEkL5x4fmkGo7x9MHrysoxiICM,1150
 scraper2/app/usecases/ingest/ingest_c106.py,sha256=mQrbASbKVUQyVcIWiXzIczbX-1mNR5NGk760enVCfvo,1190
 scraper2/app/usecases/ingest/ingest_c108.py,sha256=49ULzdl0dN6z3istAKg29PcD5wHTxYholqAZiIEmUzU,1191
-scraper2_hj3415-2.3.0.dist-info/entry_points.txt,sha256=jUNx7ZJQedQ3QnsDN1ompQ0PjwdvVmnKdHHFMfQQPlI,46
-scraper2_hj3415-2.3.0.dist-info/licenses/LICENSE,sha256=QBiVGQuKAESeCfQE344Ik2ex6g2zfYdu9WqrRWydxIs,1068
-scraper2_hj3415-2.3.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-scraper2_hj3415-2.3.0.dist-info/METADATA,sha256=QvB781yiOX_OPA6sCcBfbSCu-lxgS7edswJq0064v4I,3457
-scraper2_hj3415-2.3.0.dist-info/RECORD,,
+scraper2_hj3415-2.4.1.dist-info/entry_points.txt,sha256=jUNx7ZJQedQ3QnsDN1ompQ0PjwdvVmnKdHHFMfQQPlI,46
+scraper2_hj3415-2.4.1.dist-info/licenses/LICENSE,sha256=QBiVGQuKAESeCfQE344Ik2ex6g2zfYdu9WqrRWydxIs,1068
+scraper2_hj3415-2.4.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+scraper2_hj3415-2.4.1.dist-info/METADATA,sha256=NDBmtiIxLt2b5RsScBZdBiAoNTthZayM0p9zvwV4GO4,3457
+scraper2_hj3415-2.4.1.dist-info/RECORD,,