krx-hj3415 2.0.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

{krx → krx_hj3415}/cli.py

@@ -1,10 +1,15 @@
-# krx/cli.py
+# krx_hj3415/cli.py
 from __future__ import annotations
 
 import asyncio
 import typer
 
-from .universe_service import refresh_and_diff, apply_removed_to_nfs
+from db2_hj3415.mongo import mongo_from_env
+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.usecases.sync_universe import run_sync, apply_removed
 
 app = typer.Typer(no_args_is_help=True)
 
@@ -27,15 +32,10 @@ async def _maybe_await_close(mongo: object) -> None:
         await out
 
 
-async def _bootstrap_indexes(db) -> None:
-    from db2.settings import get_settings
-    from db2.nfs import ensure_indexes
-    from db2.universe import ensure_indexes_universe  # 네 db2에 구현돼있다는 가정
-
+async def _mongo_bootstrap(db) -> None:
     s = get_settings()
-    snapshot_ttl_days = getattr(s, "MONGO_SNAPSHOT_TTL_DAYS", None)
-    await ensure_indexes(db, snapshot_ttl_days=snapshot_ttl_days)
-    await ensure_indexes_universe(db)
+    await ensure_indexes_universe(db, snapshot_ttl_days=s.SNAPSHOT_TTL_DAYS)
+    await ensure_indexes_nfs(db, snapshot_ttl_days=s.SNAPSHOT_TTL_DAYS)
 
 
 @app.command()
@@ -53,14 +53,12 @@ def sync(
     """
 
     async def _run():
-        from db2.mongo import mongo_from_env
-
         mongo = mongo_from_env()
         db = mongo.get_db()
         try:
-            await _bootstrap_indexes(db)
+            await _mongo_bootstrap(db)
 
-            d = await refresh_and_diff(db, universe=universe, max_days=max_days, snapshot=snapshot)
+            d = await run_sync(db, universe=universe, max_days=max_days, snapshot=snapshot)
 
             typer.echo(f"\n=== UNIVERSE SYNC: {d.universe} ===")
             typer.echo(f"asof: {d.asof.isoformat()}")
@@ -82,7 +80,7 @@ def sync(
 
             if apply and d.removed:
                 typer.echo("\n=== APPLY REMOVED TO NFS ===")
-                r = await apply_removed_to_nfs(db, removed_codes=d.removed_codes)
+                r = await apply_removed(db, removed_codes=d.removed_codes)
                 typer.echo(
                     f"latest_deleted={r.get('latest_deleted', 0)}, "
                     f"snapshots_deleted={r.get('snapshots_deleted', 0)}"

krx_hj3415/domain/diff.py

@@ -0,0 +1,33 @@
+# krx_hj3415/domain/diff.py
+from __future__ import annotations
+
+from datetime import datetime
+from typing import Iterable
+from .types import UniverseDiff, CodeItem
+
+
+def _to_code_map(items: Iterable[CodeItem]) -> dict[str, CodeItem]:
+    return {it.code: it for it in items}
+
+
+def diff_universe(
+    *,
+    universe: str,
+    asof: datetime,
+    new_items: list[CodeItem],
+    old_items: list[CodeItem],
+) -> UniverseDiff:
+    new_map = _to_code_map(new_items)
+    old_map = _to_code_map(old_items)
+
+    added = [new_map[c] for c in sorted(new_map.keys() - old_map.keys())]
+    removed = [old_map[c] for c in sorted(old_map.keys() - new_map.keys())]
+    kept = len(new_map.keys() & old_map.keys())
+
+    return UniverseDiff(
+        universe=universe,
+        asof=asof,
+        added=added,
+        removed=removed,
+        kept_count=kept,
+    )

krx_hj3415/domain/types.py

@@ -0,0 +1,30 @@
+# krx_hj3415/domain/types.py
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import datetime
+
+
+@dataclass(frozen=True)
+class CodeItem:
+    code: str
+    name: str
+    asof: datetime
+    market: str | None = None  # 확장 대비(예: KRX/KOSPI/KOSDAQ/NYSE/NASDAQ 등)
+
+
+@dataclass(frozen=True)
+class UniverseDiff:
+    universe: str
+    asof: datetime
+    added: list[CodeItem]
+    removed: list[CodeItem]
+    kept_count: int
+
+    @property
+    def added_codes(self) -> list[str]:
+        return [x.code for x in self.added]
+
+    @property
+    def removed_codes(self) -> list[str]:
+        return [x.code for x in self.removed]

krx/samsungfund.py → krx_hj3415/provider/krx300_samsungfund_excel.py

@@ -1,35 +1,29 @@
-#krx/samsungfund.py
+# krx_hj3415/provider/krx300_samsungfund_excel.py
 from __future__ import annotations
 
 import random
 import time
-from dataclasses import dataclass
-from datetime import datetime, timedelta, timezone
-from io import BytesIO
-from typing import Iterable
-
 import pandas as pd
 import requests
+from datetime import datetime, timedelta, timezone
+from io import BytesIO
 
-from .models import CodeItem
+from domain_hj3415.common.time import utcnow
+from krx_hj3415.domain.types import CodeItem
 
 
 FUND_ID = "2ETFA4"
 BASE_URL = "https://www.samsungfund.com/excel_pdf.do"
 
 
-def _utcnow() -> datetime:
-    return datetime.now(timezone.utc)
-
-
 def _looks_like_excel(content: bytes) -> bool:
     # xls(ole) or xlsx(zip) 대충 체크
-    return content.startswith(b"\xD0\xCF\x11\xE0") or content.startswith(b"PK\x03\x04")
+    return content.startswith(b"\xd0\xcf\x11\xe0") or content.startswith(b"PK\x03\x04")
 
 
 def find_valid_url(*, max_days: int = 15, timeout: int = 8) -> tuple[str, datetime]:
     for delta in range(1, max_days + 1):
-        day = (_utcnow() - timedelta(days=delta)).astimezone(timezone.utc)
+        day = (utcnow() - timedelta(days=delta)).astimezone(timezone.utc)
         date_str = day.strftime("%Y%m%d")
         url = f"{BASE_URL}?fId={FUND_ID}&gijunYMD={date_str}"
 
@@ -84,4 +78,4 @@ def parse_krx300_items(excel_bytes: bytes, *, asof: datetime) -> list[CodeItem]:
 def fetch_krx300_items(*, max_days: int = 15) -> tuple[datetime, list[CodeItem]]:
     excel_bytes, asof_day, _url = download_excel_bytes(max_days=max_days)
     items = parse_krx300_items(excel_bytes, asof=asof_day)
-    return asof_day, items
+    return asof_day, items

krx/universe_service.py → krx_hj3415/usecases/sync_universe.py

@@ -1,23 +1,24 @@
-# krx/universe_service.py
+# krx_hj3415/usecases/sync_universe.py
 from __future__ import annotations
 
-from dataclasses import asdict
-from datetime import datetime, timezone
-from typing import Any, Iterable
-
+from datetime import datetime
+from typing import Any, Iterable, cast
 from pymongo.asynchronous.database import AsyncDatabase
 
-from .models import CodeItem, UniverseDiff, diff_universe
-from .samsungfund import fetch_krx300_items
-
+from domain_hj3415.common.time import utcnow
 
-def _utcnow() -> datetime:
-    return datetime.now(timezone.utc)
+from db2_hj3415.nfs.repo import delete_codes_from_nfs
+from db2_hj3415.universe.repo import (
+    upsert_latest as upsert_universe_latest,
+    insert_snapshot as insert_universe_snapshot,
+)
+from db2_hj3415.universe.repo import get_latest as get_universe_latest
 
+from contracts_hj3415.universe.dto import UniverseItemDTO, Market
 
-def _items_to_payload(items: list[CodeItem]) -> list[dict[str, Any]]:
-    # db2에 저장할 때는 dict로 바꿔서 넣는 게 가장 단순함
-    return [asdict(it) for it in items]
+from krx_hj3415.domain.types import CodeItem, UniverseDiff
+from krx_hj3415.domain.diff import diff_universe
+from krx_hj3415.provider.krx300_samsungfund_excel import fetch_krx300_items
 
 
 def _payload_to_items(payload: Any) -> list[CodeItem]:
@@ -32,7 +33,11 @@ def _payload_to_items(payload: Any) -> list[CodeItem]:
         return []
 
     data = payload
-    if isinstance(data, dict) and "payload" in data and isinstance(data["payload"], dict):
+    if (
+        isinstance(data, dict)
+        and "payload" in data
+        and isinstance(data["payload"], dict)
+    ):
         data = data["payload"]
 
     if isinstance(data, dict) and "items" in data:
@@ -56,7 +61,7 @@ def _payload_to_items(payload: Any) -> list[CodeItem]:
             asof = asof_raw
         else:
             # fallback: 현재 시각 (정확도가 중요하면 ISO parse 추가)
-            asof = _utcnow()
+            asof = utcnow()
         out.append(CodeItem(code=code, name=name, asof=asof, market=market))
     return out
 
@@ -66,7 +71,31 @@ async def refresh_krx300(*, max_days: int = 15) -> tuple[datetime, list[CodeItem
     return fetch_krx300_items(max_days=max_days)
 
 
-async def refresh_and_diff(
+def to_universe_item_dtos(items: Iterable[Any], *, market: str = "KRX") -> list[UniverseItemDTO]:
+    out: list[UniverseItemDTO] = []
+    for it in items:
+        if it is None:
+            continue
+
+        if isinstance(it, dict):
+            code = (it.get("code") or "").strip()
+            name = it.get("name")
+        else:
+            code = (getattr(it, "code", "") or "").strip()
+            name = getattr(it, "name", None)
+
+        if not code:
+            continue
+
+        dto: UniverseItemDTO = {"code": code, "market": cast(Market, market)}
+        if isinstance(name, str) and name.strip():
+            dto["name"] = name.strip()
+
+        out.append(dto)
+    return out
+
+
+async def run_sync(
     db: AsyncDatabase,
     *,
     universe: str = "krx300",
@@ -86,23 +115,27 @@ async def refresh_and_diff(
     asof, new_items = await refresh_krx300(max_days=max_days)
 
     # --- 2) load old ---
-    from db2.universe import get_universe_latest  # ✅ db2에 구현돼있다고 가정
     old_doc = await get_universe_latest(db, universe=universe)
     old_items = _payload_to_items(old_doc)
 
     # --- 3) diff ---
-    d = diff_universe(universe=universe, asof=asof, new_items=new_items, old_items=old_items)
+    d = diff_universe(
+        universe=universe, asof=asof, new_items=new_items, old_items=old_items
+    )
 
     # --- 4) save ---
-    from db2.universe import upsert_universe_latest, insert_universe_snapshot  # ✅ 가정
-    await upsert_universe_latest(db, universe=universe, items=_items_to_payload(new_items), asof=asof)
+    await upsert_universe_latest(
+        db, universe=universe, items=to_universe_item_dtos(new_items), asof=asof
+    )
     if snapshot:
-        await insert_universe_snapshot(db, universe=universe, items=_items_to_payload(new_items), asof=asof)
+        await insert_universe_snapshot(
+            db, universe=universe, items=to_universe_item_dtos(new_items), asof=asof
+        )
 
     return d
 
 
-async def apply_removed_to_nfs(
+async def apply_removed(
     db: AsyncDatabase,
     *,
     removed_codes: Iterable[str],
@@ -114,12 +147,4 @@ async def apply_removed_to_nfs(
     if not codes:
         return {"latest_deleted": 0, "snapshots_deleted": 0}
 
-    # 너가 db2.nfs에 추가한 “명확한 의도 API”로 맞추는 걸 추천
-    # 예: delete_codes_from_all_endpoints(db, codes)
-    try:
-        from db2.nfs import delete_codes_from_all_endpoints  # ✅ 네가 추가했다고 가정
-        return await delete_codes_from_all_endpoints(db, codes=codes)
-    except Exception:
-        # fallback: 이미 있는 delete_codes_from_nfs(endpoint=None) 사용
-        from db2.nfs import delete_codes_from_nfs
-        return await delete_codes_from_nfs(db, codes=codes, endpoint=None)  # type: ignore[arg-type]
+    return await delete_codes_from_nfs(db, codes=codes, endpoint=None)

{krx_hj3415-2.0.0.dist-info → krx_hj3415-2.2.0.dist-info}/METADATA

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

krx_hj3415-2.2.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+krx_hj3415/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+krx_hj3415/cli.py,sha256=F6ZpX8k1fNwtsRv59ixv3d1dPSnmWyxwXZbzu61ViWI,3174
+krx_hj3415/domain/diff.py,sha256=m6nl73Anjx2si6vr9a-FXdH5iKVHh_4kXF9RHgplSdY,847
+krx_hj3415/domain/types.py,sha256=-ERCYZXLX0LGjqEthcrBUpNWgBf2tJ5NgHE5Zxg2pls,663
+krx_hj3415/provider/krx300_samsungfund_excel.py,sha256=WCQAeBsED5Cp9-4lZcptifwX1yY_-XRAP4iO8w5kb0A,2776
+krx_hj3415/usecases/sync_universe.py,sha256=jlhMdKJsFbBD87kX0Y4eiuQdxVDWcpv07OJ45_bMFlg,4489
+krx_hj3415-2.2.0.dist-info/entry_points.txt,sha256=qasj01Y1e0MIVlUXOraAZCAxDTn07CyMVV58hrYDamA,42
+krx_hj3415-2.2.0.dist-info/licenses/LICENSE,sha256=QBiVGQuKAESeCfQE344Ik2ex6g2zfYdu9WqrRWydxIs,1068
+krx_hj3415-2.2.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+krx_hj3415-2.2.0.dist-info/METADATA,sha256=ob5DNLcwjFtsTKN5dTpEVNS06YKpJAc-qZV54I4Wxw4,2309
+krx_hj3415-2.2.0.dist-info/RECORD,,

krx_hj3415-2.2.0.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+krx=krx_hj3415.cli:app
+

krx/__init__.py

@@ -1,12 +0,0 @@
-# krx/__init__.py
-from .models import CodeItem, UniverseDiff
-from .samsungfund import fetch_krx300_items
-from .universe_service import refresh_and_diff, apply_removed_to_nfs
-
-__all__ = [
-    "CodeItem",
-    "UniverseDiff",
-    "fetch_krx300_items",
-    "refresh_and_diff",
-    "apply_removed_to_nfs",
-]

krx/models.py

@@ -1,52 +0,0 @@
-# krx/models.py
-from __future__ import annotations
-
-from dataclasses import dataclass
-from datetime import datetime
-from typing import Any, Iterable
-
-
-@dataclass(frozen=True)
-class CodeItem:
-    code: str
-    name: str
-    asof: datetime
-    market: str | None = None  # 확장 대비(예: KRX/KOSPI/KOSDAQ/NYSE/NASDAQ 등)
-
-
-@dataclass(frozen=True)
-class UniverseDiff:
-    universe: str
-    asof: datetime
-    added: list[CodeItem]
-    removed: list[CodeItem]
-    kept_count: int
-
-    @property
-    def added_codes(self) -> list[str]:
-        return [x.code for x in self.added]
-
-    @property
-    def removed_codes(self) -> list[str]:
-        return [x.code for x in self.removed]
-
-
-def _to_code_map(items: Iterable[CodeItem]) -> dict[str, CodeItem]:
-    return {it.code: it for it in items}
-
-
-def diff_universe(*, universe: str, asof: datetime, new_items: list[CodeItem], old_items: list[CodeItem]) -> UniverseDiff:
-    new_map = _to_code_map(new_items)
-    old_map = _to_code_map(old_items)
-
-    added = [new_map[c] for c in sorted(new_map.keys() - old_map.keys())]
-    removed = [old_map[c] for c in sorted(old_map.keys() - new_map.keys())]
-    kept = len(new_map.keys() & old_map.keys())
-
-    return UniverseDiff(
-        universe=universe,
-        asof=asof,
-        added=added,
-        removed=removed,
-        kept_count=kept,
-    )

krx_hj3415-2.0.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-krx/__init__.py,sha256=eqkijmpo1DwxMnxdBMYwgOj7yGynD6F8m8WjZpZ8RSk,302
-krx/cli.py,sha256=dE9n_AYZxT8VIndlitLsTJmp5T59lAGqLeV64P0WfJ4,3191
-krx/models.py,sha256=l35-C8jH32UOEBnHhFklE13P5ZDTg9Wft__WhSSqbxg,1342
-krx/samsungfund.py,sha256=m6add740cBQFgxZ5rW9xYXp_JBKKK03Y-bzb01GVq4w,2815
-krx/universe_service.py,sha256=xBhDSl1iGBgSQDZ8x7SZ8zzz2H4eS5j19HKOgxMJggo,4224
-krx_hj3415-2.0.0.dist-info/entry_points.txt,sha256=OR4WCHhNKwt2oBeySB2bSapcjl5SADj7kvEcxo44dPo,35
-krx_hj3415-2.0.0.dist-info/licenses/LICENSE,sha256=QBiVGQuKAESeCfQE344Ik2ex6g2zfYdu9WqrRWydxIs,1068
-krx_hj3415-2.0.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-krx_hj3415-2.0.0.dist-info/METADATA,sha256=XvX6CAl-qmD4ROEoO4OZz3oxXv1QQm7sFbYkIr73Xiw,2309
-krx_hj3415-2.0.0.dist-info/RECORD,,

krx_hj3415-2.0.0.dist-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-krx=krx.cli:app
-