krx-hj3415 2.2.1__py3-none-any.whl → 2.2.3__py3-none-any.whl

krx_hj3415/cli.py

@@ -9,6 +9,7 @@ from db2_hj3415.settings import get_settings
 from db2_hj3415.universe.repo import ensure_indexes as ensure_indexes_universe
 from db2_hj3415.nfs.repo import ensure_indexes as ensure_indexes_nfs
 
+from krx_hj3415.domain.universe import UniverseKind
 from krx_hj3415.usecases.sync_universe import run_sync, apply_removed
 
 app = typer.Typer(no_args_is_help=True)
@@ -58,7 +59,7 @@ def sync(
         try:
             await _mongo_bootstrap(db)
 
-            d = await run_sync(db, universe=universe, max_days=max_days, snapshot=snapshot)
+            d = await run_sync(db, universe=UniverseKind(universe), max_days=max_days, snapshot=snapshot)
 
             typer.echo(f"\n=== UNIVERSE SYNC: {d.universe} ===")
             typer.echo(f"asof: {d.asof.isoformat()}")

krx_hj3415/domain/universe.py

@@ -0,0 +1,8 @@
+# krx300_hj3415/domain/universe.py
+from __future__ import annotations
+
+from enum import StrEnum
+
+class UniverseKind(StrEnum):
+    KRX300 = "krx300"
+

krx_hj3415/usecases/sync_universe.py

@@ -14,37 +14,20 @@ from db2_hj3415.universe.repo import (
 )
 from db2_hj3415.universe.repo import get_latest as get_universe_latest
 
-from contracts_hj3415.universe.dto import UniverseItemDTO, Market
+from contracts_hj3415.universe.dto import UniverseItemDTO, UniversePayloadDTO
+from contracts_hj3415.universe.types import UniverseNames
 
 from krx_hj3415.domain.types import CodeItem, UniverseDiff
 from krx_hj3415.domain.diff import diff_universe
+from krx_hj3415.domain.universe import UniverseKind
 from krx_hj3415.provider.krx300_samsungfund_excel import fetch_krx300_items
 
 
-def _payload_to_items(payload: Any) -> list[CodeItem]:
-    """
-    db2 universe_latest 에 저장된 형태를 복원.
-    payload가 아래 중 뭐든 대응:
-      - {"items": [...]} 형태
-      - {"payload": {"items": [...]}} 형태
-      - 그냥 [...items...] 리스트
-    """
-    if payload is None:
+def _payload_dto_to_items(dto: UniversePayloadDTO) -> list[CodeItem]:
+    if dto is None:
         return []
 
-    data = payload
-    if (
-        isinstance(data, dict)
-        and "payload" in data
-        and isinstance(data["payload"], dict)
-    ):
-        data = data["payload"]
-
-    if isinstance(data, dict) and "items" in data:
-        data = data["items"]
-
-    if not isinstance(data, list):
-        return []
+    data = dto["items"]
 
     out: list[CodeItem] = []
     for row in data:
@@ -55,13 +38,7 @@ def _payload_to_items(payload: Any) -> list[CodeItem]:
             continue
         name = str(row.get("name") or "").strip()
         market = row.get("market")
-        asof_raw = row.get("asof")
-        # asof는 DB에서 datetime으로 나오기도, ISO string으로 나오기도 함
-        if isinstance(asof_raw, datetime):
-            asof = asof_raw
-        else:
-            # fallback: 현재 시각 (정확도가 중요하면 ISO parse 추가)
-            asof = utcnow()
+        asof = utcnow()
         out.append(CodeItem(code=code, name=name, asof=asof, market=market))
     return out
 
@@ -71,7 +48,9 @@ async def refresh_krx300(*, max_days: int = 15) -> tuple[datetime, list[CodeItem
     return fetch_krx300_items(max_days=max_days)
 
 
-def to_universe_item_dtos(items: Iterable[Any], *, market: str = "KRX") -> list[UniverseItemDTO]:
+def to_universe_item_dtos(
+    items: Iterable[Any], *, market: str = "KRX"
+) -> list[UniverseItemDTO]:
     out: list[UniverseItemDTO] = []
     for it in items:
         if it is None:
@@ -87,7 +66,7 @@ def to_universe_item_dtos(items: Iterable[Any], *, market: str = "KRX") -> list[
         if not code:
             continue
 
-        dto: UniverseItemDTO = {"code": code, "market": cast(Market, market)}
+        dto: UniverseItemDTO = {"code": code, "market": market}
         if isinstance(name, str) and name.strip():
             dto["name"] = name.strip()
 
@@ -98,7 +77,7 @@ def to_universe_item_dtos(items: Iterable[Any], *, market: str = "KRX") -> list[
 async def run_sync(
     db: AsyncDatabase,
     *,
-    universe: str = "krx300",
+    universe: UniverseKind = UniverseKind.KRX300,
     max_days: int = 15,
     snapshot: bool = True,
 ) -> UniverseDiff:
@@ -109,27 +88,34 @@ async def run_sync(
     4) latest upsert + (선택) snapshots insert
     """
     # --- 1) fetch ---
-    if universe != "krx300":
-        raise ValueError(f"Unsupported universe: {universe}")
-
     asof, new_items = await refresh_krx300(max_days=max_days)
 
     # --- 2) load old ---
-    old_doc = await get_universe_latest(db, universe=universe)
-    old_items = _payload_to_items(old_doc)
+    old_payload_dto = await get_universe_latest(
+        db, universe=cast(UniverseNames, universe.value)
+    )
+    old_items = _payload_dto_to_items(old_payload_dto)
 
     # --- 3) diff ---
     d = diff_universe(
-        universe=universe, asof=asof, new_items=new_items, old_items=old_items
+        universe=universe.value, asof=asof, new_items=new_items, old_items=old_items
     )
 
     # --- 4) save ---
     await upsert_universe_latest(
-        db, universe=universe, items=to_universe_item_dtos(new_items), asof=asof
+        db,
+        universe=cast(UniverseNames, universe.value),
+        items=to_universe_item_dtos(new_items, market="KRX"),
+        asof=asof,
+        source="samsungfund",
     )
     if snapshot:
         await insert_universe_snapshot(
-            db, universe=universe, items=to_universe_item_dtos(new_items), asof=asof
+            db,
+            universe=cast(UniverseNames, universe.value),
+            items=to_universe_item_dtos(new_items, market="KRX"),
+            asof=asof,
+            source="samsungfund",
         )
 
     return d
@@ -147,4 +133,4 @@ async def apply_removed(
     if not codes:
         return {"latest_deleted": 0, "snapshots_deleted": 0}
 
-    return await delete_codes_from_nfs(db, codes=codes, endpoint=None)
+    return await delete_codes_from_nfs(db, codes=codes, endpoint=None)

{krx_hj3415-2.2.1.dist-info → krx_hj3415-2.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: krx-hj3415
-Version: 2.2.1
+Version: 2.2.3
 Summary: KRX300 code scraper
 Keywords: example,demo
 Author-email: Hyungjin Kim <hj3415@gmail.com>

{krx_hj3415-2.2.1.dist-info → krx_hj3415-2.2.3.dist-info}/RECORD

@@ -1,14 +1,15 @@
 krx_hj3415/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-krx_hj3415/cli.py,sha256=F6ZpX8k1fNwtsRv59ixv3d1dPSnmWyxwXZbzu61ViWI,3174
+krx_hj3415/cli.py,sha256=i4KbK1j_gOpITNCDuBJR2aY8LU45J5WBRcMbacDavt8,3240
 krx_hj3415/domain/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 krx_hj3415/domain/diff.py,sha256=m6nl73Anjx2si6vr9a-FXdH5iKVHh_4kXF9RHgplSdY,847
 krx_hj3415/domain/types.py,sha256=-ERCYZXLX0LGjqEthcrBUpNWgBf2tJ5NgHE5Zxg2pls,663
+krx_hj3415/domain/universe.py,sha256=eL1huxToFudvqmYKiDHmkpTvunz5VDXjTpuWoQ6mA00,149
 krx_hj3415/provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 krx_hj3415/provider/krx300_samsungfund_excel.py,sha256=WCQAeBsED5Cp9-4lZcptifwX1yY_-XRAP4iO8w5kb0A,2776
 krx_hj3415/usecases/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-krx_hj3415/usecases/sync_universe.py,sha256=jlhMdKJsFbBD87kX0Y4eiuQdxVDWcpv07OJ45_bMFlg,4489
-krx_hj3415-2.2.1.dist-info/entry_points.txt,sha256=qasj01Y1e0MIVlUXOraAZCAxDTn07CyMVV58hrYDamA,42
-krx_hj3415-2.2.1.dist-info/licenses/LICENSE,sha256=QBiVGQuKAESeCfQE344Ik2ex6g2zfYdu9WqrRWydxIs,1068
-krx_hj3415-2.2.1.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-krx_hj3415-2.2.1.dist-info/METADATA,sha256=Ke-YK_6EX_bQ8gjWIuq4tYwijSmejkyjaTCg5xStq6E,2290
-krx_hj3415-2.2.1.dist-info/RECORD,,
+krx_hj3415/usecases/sync_universe.py,sha256=xhas9NBQW5v4KM--Df3hxhuOrlM4GpoqDP4HRw-Fnu4,4008
+krx_hj3415-2.2.3.dist-info/entry_points.txt,sha256=qasj01Y1e0MIVlUXOraAZCAxDTn07CyMVV58hrYDamA,42
+krx_hj3415-2.2.3.dist-info/licenses/LICENSE,sha256=QBiVGQuKAESeCfQE344Ik2ex6g2zfYdu9WqrRWydxIs,1068
+krx_hj3415-2.2.3.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+krx_hj3415-2.2.3.dist-info/METADATA,sha256=o0KpFVVjZBipIWR4su8sJBXvPEirQUwylmEyG0ay5q4,2290
+krx_hj3415-2.2.3.dist-info/RECORD,,