krx-hj3415 2.2.3__tar.gz → 2.3.0__tar.gz

{krx_hj3415-2.2.3 → krx_hj3415-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: krx-hj3415
-Version: 2.2.3
+Version: 2.3.0
 Summary: KRX300 code scraper
 Keywords: example,demo
 Author-email: Hyungjin Kim <hj3415@gmail.com>
@@ -17,7 +17,7 @@ Requires-Dist: xlrd>=2.0.2
 Requires-Dist: typer>=0.21.1
 Requires-Dist: db2-hj3415
 Requires-Dist: contracts-hj3415
-Requires-Dist: domain-hj3415
+Requires-Dist: common-hj3415
 
 # krx-hj3415
 

{krx_hj3415-2.2.3 → krx_hj3415-2.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "krx-hj3415"                          # PyPI 이름 (하이픈 허용)
-version = "2.2.3"
+version = "2.3.0"
 description = "KRX300 code scraper"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -25,7 +25,7 @@ dependencies = [
   "typer>=0.21.1",
   "db2-hj3415",
   "contracts-hj3415",
-  "domain-hj3415",
+  "common-hj3415",
 ]
 
 [tool.flit.module]

krx_hj3415-2.3.0/src/krx_hj3415/app/adapters/nfs_store_db2.py

@@ -0,0 +1,16 @@
+from __future__ import annotations
+
+from typing import Sequence
+
+from pymongo.asynchronous.database import AsyncDatabase
+
+from db2_hj3415.nfs.repo import delete_codes_from_nfs
+from krx_hj3415.app.ports.nfs_cleaner import NfsCleanerPort
+
+
+class NfsCleanerDb2(NfsCleanerPort):
+    def __init__(self, db: AsyncDatabase):
+        self._db = db
+
+    async def delete_codes(self, *, codes: Sequence[str]) -> dict[str, int]:
+        return await delete_codes_from_nfs(self._db, codes=codes, endpoint=None)

krx_hj3415-2.3.0/src/krx_hj3415/app/adapters/universe_store_db2.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from pymongo.asynchronous.database import AsyncDatabase
+
+from contracts_hj3415.universe.dto import UniverseDTO
+from contracts_hj3415.universe.types import Universe
+
+from db2_hj3415.universe import repo as urepo
+from db2_hj3415.universe import mappers as umap
+
+from krx_hj3415.app.ports.universe_store import UniverseStorePort
+
+
+class UniverseStoreDb2(UniverseStorePort):
+    def __init__(self, db: AsyncDatabase):
+        self._db = db
+
+    async def get_latest(self, *, universe: Universe) -> UniverseDTO | None:
+        doc = await urepo.get_latest(self._db, universe=universe)
+        if not doc:
+            return None
+        return umap.latest_doc_to_dto(doc)
+
+    async def upsert_latest(self, *, dto: UniverseDTO) -> None:
+        doc = umap.dto_to_latest_doc(dto)
+        await urepo.upsert_latest_doc(self._db, doc=doc)
+
+    async def insert_snapshot(self, *, dto: UniverseDTO) -> None:
+        doc = umap.dto_to_snapshot_doc(dto)
+        await urepo.insert_snapshot_doc(self._db, doc=doc)

{krx_hj3415-2.2.3/src/krx_hj3415 → krx_hj3415-2.3.0/src/krx_hj3415/app}/domain/diff.py

@@ -1,9 +1,9 @@
-# krx_hj3415/domain/diff.py
+# krx_hj3415/app/domain/diff.py
 from __future__ import annotations
 
 from datetime import datetime
 from typing import Iterable
-from .types import UniverseDiff, CodeItem
+from .types import UniverseDiff, CodeItem, UniverseEnum
 
 
 def _to_code_map(items: Iterable[CodeItem]) -> dict[str, CodeItem]:
@@ -12,7 +12,7 @@ def _to_code_map(items: Iterable[CodeItem]) -> dict[str, CodeItem]:
 
 def diff_universe(
     *,
-    universe: str,
+    universe: UniverseEnum,
     asof: datetime,
     new_items: list[CodeItem],
     old_items: list[CodeItem],

{krx_hj3415-2.2.3/src/krx_hj3415 → krx_hj3415-2.3.0/src/krx_hj3415/app}/domain/types.py

@@ -1,21 +1,27 @@
-# krx_hj3415/domain/types.py
+# krx_hj3415/app/domain/types.py
 from __future__ import annotations
 
 from dataclasses import dataclass
 from datetime import datetime
+from enum import StrEnum
 
+class UniverseEnum(StrEnum):
+    KRX300 = "KRX300"
+
+class MarketEnum(StrEnum):
+    KRX = "KRX"
 
 @dataclass(frozen=True)
 class CodeItem:
     code: str
     name: str
     asof: datetime
-    market: str | None = None  # 확장 대비(예: KRX/KOSPI/KOSDAQ/NYSE/NASDAQ 등)
+    market: MarketEnum
 
 
 @dataclass(frozen=True)
 class UniverseDiff:
-    universe: str
+    universe: UniverseEnum
     asof: datetime
     added: list[CodeItem]
     removed: list[CodeItem]

krx_hj3415-2.3.0/src/krx_hj3415/app/ports/nfs_cleaner.py

@@ -0,0 +1,8 @@
+from __future__ import annotations
+
+from typing import Protocol, Sequence
+
+
+class NfsCleanerPort(Protocol):
+    async def delete_codes(self, *, codes: Sequence[str]) -> dict[str, int]:
+        ...

krx_hj3415-2.3.0/src/krx_hj3415/app/ports/universe_store.py

@@ -0,0 +1,17 @@
+from __future__ import annotations
+
+from typing import Protocol
+
+from contracts_hj3415.universe.dto import UniverseDTO
+from contracts_hj3415.universe.types import Universe
+
+
+class UniverseStorePort(Protocol):
+    async def get_latest(self, *, universe: Universe) -> UniverseDTO | None:
+        ...
+
+    async def upsert_latest(self, *, dto: UniverseDTO) -> None:
+        ...
+
+    async def insert_snapshot(self, *, dto: UniverseDTO) -> None:
+        ...

{krx_hj3415-2.2.3/src/krx_hj3415 → krx_hj3415-2.3.0/src/krx_hj3415/app}/provider/krx300_samsungfund_excel.py

@@ -1,4 +1,4 @@
-# krx_hj3415/provider/krx300_samsungfund_excel.py
+# krx_hj3415/app/provider/krx300_samsungfund_excel.py
 from __future__ import annotations
 
 import random
@@ -8,9 +8,8 @@ import requests
 from datetime import datetime, timedelta, timezone
 from io import BytesIO
 
-from domain_hj3415.common.time import utcnow
-from krx_hj3415.domain.types import CodeItem
-
+from common_hj3415.utils.time import utcnow
+from krx_hj3415.app.domain.types import CodeItem, MarketEnum
 
 FUND_ID = "2ETFA4"
 BASE_URL = "https://www.samsungfund.com/excel_pdf.do"
@@ -55,6 +54,7 @@ def download_excel_bytes(*, max_days: int = 15) -> tuple[bytes, datetime, str]:
 
 
 def parse_krx300_items(excel_bytes: bytes, *, asof: datetime) -> list[CodeItem]:
+    market = MarketEnum.KRX
     # 네가 쓰던 조건: usecols B:I, skiprows 2
     df = pd.read_excel(BytesIO(excel_bytes), usecols="B:I", skiprows=2)  # type: ignore
 
@@ -71,7 +71,7 @@ def parse_krx300_items(excel_bytes: bytes, *, asof: datetime) -> list[CodeItem]:
 
     items: list[CodeItem] = []
     for code, name in zip(df["종목코드"].astype(str), df["종목명"].astype(str)):
-        items.append(CodeItem(code=code, name=name, asof=asof))
+        items.append(CodeItem(code=code, name=name, asof=asof, market=market))
     return items
 
 

krx_hj3415-2.3.0/src/krx_hj3415/app/usecases/sync_universe.py

@@ -0,0 +1,118 @@
+# krx_hj3415/app/usecases/sync_universe.py
+from __future__ import annotations
+
+from datetime import datetime
+from typing import Iterable, cast
+
+from common_hj3415.utils.time import utcnow
+
+from contracts_hj3415.universe.dto import UniverseItemDTO, UniverseDTO
+from contracts_hj3415.universe.types import Universe
+
+from krx_hj3415.app.domain.types import CodeItem, UniverseDiff, UniverseEnum, MarketEnum
+from krx_hj3415.app.domain.diff import diff_universe
+from krx_hj3415.app.provider.krx300_samsungfund_excel import fetch_krx300_items
+
+from krx_hj3415.app.ports.universe_store import UniverseStorePort
+from krx_hj3415.app.ports.nfs_cleaner import NfsCleanerPort
+
+
+async def refresh_krx300(*, max_days: int = 15) -> tuple[datetime, list[CodeItem]]:
+    return fetch_krx300_items(max_days=max_days)
+
+
+def _dto_to_code_items(dto: UniverseDTO | None) -> list[CodeItem]:
+    if not dto:
+        return []
+
+    out: list[CodeItem] = []
+    for row in dto.get("items", []):
+        if not isinstance(row, dict):
+            continue
+        code = str(row.get("code") or "").strip()
+        if not code:
+            continue
+        name = str(row.get("name") or "").strip()
+        market = MarketEnum(row.get("market"))
+        # old_item의 asof는 diff 용도라면 dto["asof"]를 쓰는 게 더 자연스럽긴 함(선택)
+        out.append(CodeItem(code=code, name=name, asof=utcnow(), market=market))
+    return out
+
+
+def _code_items_to_dtos(
+    items: Iterable[CodeItem],
+    *,
+    market: MarketEnum = MarketEnum.KRX,
+) -> list[UniverseItemDTO]:
+    """
+    krx 도메인 CodeItem 목록을 contracts UniverseItemDTO 목록으로 변환한다.
+
+    - CodeItem.code 는 필수
+    - CodeItem.name 은 비어있지 않을 때만 포함
+    - market 은 krx 정책(default: "KRX")에 따라 주입
+    """
+    out: list[UniverseItemDTO] = []
+
+    for it in items:
+        if it is None:
+            continue
+
+        code = (it.code or "").strip()
+        if not code:
+            continue
+
+        dto: UniverseItemDTO = {
+            "code": code,
+            "market": market.value,
+        }
+
+        if isinstance(it.name, str) and it.name.strip():
+            dto["name"] = it.name.strip()
+
+        out.append(dto)
+
+    return out
+
+
+async def apply_removed(
+    cleaner: NfsCleanerPort,
+    *,
+    removed_codes: Iterable[str],
+) -> dict[str, int]:
+    codes = [str(c).strip() for c in removed_codes if c and str(c).strip()]
+    if not codes:
+        return {"latest_deleted": 0, "snapshots_deleted": 0}
+    return await cleaner.delete_codes(codes=codes)
+
+
+async def run_sync(
+    universe_store: UniverseStorePort,
+    *,
+    universe: UniverseEnum = UniverseEnum.KRX300,
+    max_days: int = 15,
+    snapshot: bool = True,
+) -> UniverseDiff:
+    # 1) fetch
+    asof, new_items = await refresh_krx300(max_days=max_days)
+
+    # 2) load old (DTO)
+    old_dto = await universe_store.get_latest(universe=cast(Universe, universe.value))
+    old_items = _dto_to_code_items(old_dto)
+
+    # 3) diff
+    d = diff_universe(
+        universe=universe, asof=asof, new_items=new_items, old_items=old_items
+    )
+
+    # 4) save (DTO로 저장 요청)
+    dto: UniverseDTO = {
+        "universe": universe.value,
+        "asof": asof,
+        "source": "samsungfund",
+        "items": _code_items_to_dtos(new_items, market=MarketEnum.KRX),
+    }
+    await universe_store.upsert_latest(dto=dto)
+    if snapshot:
+        await universe_store.insert_snapshot(dto=dto)
+
+    return d

{krx_hj3415-2.2.3 → krx_hj3415-2.3.0}/src/krx_hj3415/cli.py

@@ -9,8 +9,14 @@ 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
+from krx_hj3415.app.ports.nfs_cleaner import NfsCleanerPort
+from krx_hj3415.app.ports.universe_store import UniverseStorePort
+
+from krx_hj3415.app.adapters.universe_store_db2 import UniverseStoreDb2
+from krx_hj3415.app.adapters.nfs_store_db2 import NfsCleanerDb2
+
+from krx_hj3415.app.domain.types import UniverseEnum
+from krx_hj3415.app.usecases.sync_universe import run_sync, apply_removed
 
 app = typer.Typer(no_args_is_help=True)
 
@@ -41,10 +47,16 @@ async def _mongo_bootstrap(db) -> None:
 
 @app.command()
 def sync(
-    universe: str = typer.Argument("krx300", help="유니버스 이름 (현재: krx300)"),
-    apply: bool = typer.Option(False, "--apply", help="removed를 nfs에서 실제 삭제까지 적용"),
-    snapshot: bool = typer.Option(True, "--snapshot/--no-snapshot", help="universe snapshot 저장 여부"),
-    max_days: int = typer.Option(15, "--max-days", help="최대 며칠 전까지 유효 엑셀 URL 탐색"),
+    universe: str = typer.Argument("KRX300", help="유니버스 이름 (현재: KRX300)"),
+    apply: bool = typer.Option(
+        False, "--apply", help="removed를 nfs에서 실제 삭제까지 적용"
+    ),
+    snapshot: bool = typer.Option(
+        True, "--snapshot/--no-snapshot", help="universe snapshot 저장 여부"
+    ),
+    max_days: int = typer.Option(
+        15, "--max-days", help="최대 며칠 전까지 유효 엑셀 URL 탐색"
+    ),
 ):
     """
     1) 외부에서 유니버스 수집
@@ -59,11 +71,21 @@ def sync(
         try:
             await _mongo_bootstrap(db)
 
-            d = await run_sync(db, universe=UniverseKind(universe), max_days=max_days, snapshot=snapshot)
+            store: UniverseStorePort = UniverseStoreDb2(db)
+            cleaner: NfsCleanerPort = NfsCleanerDb2(db)
+
+            d = await run_sync(
+                store,
+                universe=UniverseEnum(universe),
+                max_days=max_days,
+                snapshot=snapshot,
+            )
 
             typer.echo(f"\n=== UNIVERSE SYNC: {d.universe} ===")
             typer.echo(f"asof: {d.asof.isoformat()}")
-            typer.echo(f"added: {len(d.added)}, removed: {len(d.removed)}, kept: {d.kept_count}")
+            typer.echo(
+                f"added: {len(d.added)}, removed: {len(d.removed)}, kept: {d.kept_count}"
+            )
 
             if d.added:
                 typer.echo("\n[ADDED]")
@@ -81,7 +103,7 @@ def sync(
 
             if apply and d.removed:
                 typer.echo("\n=== APPLY REMOVED TO NFS ===")
-                r = await apply_removed(db, removed_codes=d.removed_codes)
+                r = await apply_removed(cleaner, removed_codes=d.removed_codes)
                 typer.echo(
                     f"latest_deleted={r.get('latest_deleted', 0)}, "
                     f"snapshots_deleted={r.get('snapshots_deleted', 0)}"
@@ -96,4 +118,4 @@ def sync(
 
 
 if __name__ == "__main__":
-    app()
+    app()

krx_hj3415-2.2.3/src/krx_hj3415/domain/universe.py

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

krx_hj3415-2.2.3/src/krx_hj3415/usecases/sync_universe.py

@@ -1,136 +0,0 @@
-# krx_hj3415/usecases/sync_universe.py
-from __future__ import annotations
-
-from datetime import datetime
-from typing import Any, Iterable, cast
-from pymongo.asynchronous.database import AsyncDatabase
-
-from domain_hj3415.common.time import utcnow
-
-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, 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_dto_to_items(dto: UniversePayloadDTO) -> list[CodeItem]:
-    if dto is None:
-        return []
-
-    data = dto["items"]
-
-    out: list[CodeItem] = []
-    for row in data:
-        if not isinstance(row, dict):
-            continue
-        code = str(row.get("code") or "").strip()
-        if not code:
-            continue
-        name = str(row.get("name") or "").strip()
-        market = row.get("market")
-        asof = utcnow()
-        out.append(CodeItem(code=code, name=name, asof=asof, market=market))
-    return out
-
-
-async def refresh_krx300(*, max_days: int = 15) -> tuple[datetime, list[CodeItem]]:
-    # 현재는 KRX300만 구현. 다른 universe도 늘리면 여기서 분기
-    return fetch_krx300_items(max_days=max_days)
-
-
-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": market}
-        if isinstance(name, str) and name.strip():
-            dto["name"] = name.strip()
-
-        out.append(dto)
-    return out
-
-
-async def run_sync(
-    db: AsyncDatabase,
-    *,
-    universe: UniverseKind = UniverseKind.KRX300,
-    max_days: int = 15,
-    snapshot: bool = True,
-) -> UniverseDiff:
-    """
-    1) 외부에서 최신 유니버스 수집
-    2) DB에서 이전 latest 조회
-    3) diff 계산
-    4) latest upsert + (선택) snapshots insert
-    """
-    # --- 1) fetch ---
-    asof, new_items = await refresh_krx300(max_days=max_days)
-
-    # --- 2) load old ---
-    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.value, asof=asof, new_items=new_items, old_items=old_items
-    )
-
-    # --- 4) save ---
-    await upsert_universe_latest(
-        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=cast(UniverseNames, universe.value),
-            items=to_universe_item_dtos(new_items, market="KRX"),
-            asof=asof,
-            source="samsungfund",
-        )
-
-    return d
-
-
-async def apply_removed(
-    db: AsyncDatabase,
-    *,
-    removed_codes: Iterable[str],
-) -> dict[str, int]:
-    """
-    removed codes를 nfs(latest/snapshots)에서 모두 삭제.
-    """
-    codes = [str(c).strip() for c in removed_codes if c and str(c).strip()]
-    if not codes:
-        return {"latest_deleted": 0, "snapshots_deleted": 0}
-
-    return await delete_codes_from_nfs(db, codes=codes, endpoint=None)