db2_hj3415 0.1.2__py2.py3-none-any.whl → 0.1.3__py2.py3-none-any.whl

db2_hj3415/common/connection.py

@@ -1,6 +1,8 @@
 # MongoDB/Redis 연결
 import os
 from motor.motor_asyncio import AsyncIOMotorClient
+import redis.asyncio as redis
+from redis.asyncio.client import Redis
 
 # 싱글톤 몽고 클라이언트 정의
 MONGO_URI = os.getenv("MONGO_ADDR", "mongodb://localhost:27017")
@@ -14,4 +16,14 @@ def get_mongo_client() -> AsyncIOMotorClient:
 
 def close_mongo_client():
     if client:
-        client.close()
+        client.close()
+
+
+async def get_redis() -> Redis:
+    client = redis.Redis(host="localhost", port=6379, decode_responses=True)
+    try:
+        await client.ping()
+        return client
+    except Exception as e:
+        print("Redis connection failed:", e)
+        return None

db2_hj3415/common/utils.py

@@ -1 +1,7 @@
-# 자주 쓰는 간단한 유틸 함수
+# 자주 쓰는 간단한 유틸 함수
+import pandas as pd
+import numpy as np
+
+def df_to_dict_replace_nan(df: pd.DataFrame) -> list[dict]:
+    # NaN → None으로 변환
+    return df.replace({np.nan: None}).to_dict(orient="records")

db2_hj3415/nfs/__init__.py

@@ -4,4 +4,5 @@ DATE_FORMAT = "%Y.%m.%d"
 from db2_hj3415.common import connection
 from db2_hj3415.common.utils import *
 from db2_hj3415.common.db_ops import *
-from db2_hj3415.nfs._ops import *
+from db2_hj3415.nfs._ops import *
+from db2_hj3415.nfs.models import *

db2_hj3415/nfs/_c10346.py

@@ -4,9 +4,11 @@ from motor.motor_asyncio import AsyncIOMotorClient
 import pprint
 import pandas as pd
 import json
-from db2_hj3415.nfs import DB_NAME
+from db2_hj3415.nfs import DB_NAME, C103
 from db2_hj3415.common.db_ops import get_collection
 from datetime import datetime, timezone
+import numpy as np
+
 
 from utils_hj3415 import setup_logger
 
@@ -59,30 +61,15 @@ async def _compare_and_log_diff(code: str, new_doc: dict, latest_doc: dict | Non
 
 
 def _prepare_c10346_document(code: str, data: dict[str, pd.DataFrame]) -> dict:
-    """
-    종목 코드와 여러 페이지의 DataFrame 데이터를 바탕으로 MongoDB에 저장할 문서(dict)를 생성합니다.
-
-    각 DataFrame은 null 값을 None으로 변환한 후, 레코드(행) 단위의 딕셔너리 리스트로 변환됩니다.
-    생성된 문서에는 '코드', '날짜', 그리고 각 페이지 이름을 키로 하는 데이터가 포함됩니다.
-
-    Args:
-        code (str): 종목 코드 (6자리 문자열).
-        data (dict[str, pd.DataFrame]): 페이지 이름을 키로 하고, 해당 페이지의 데이터를 담은 DataFrame을 값으로 가지는 딕셔너리.
-
-    Returns:
-        dict: MongoDB에 저장 가능한 형식의 문서. 예: {
-            "코드": "005930",
-            "날짜": <datetime>,
-            "재무상태표y": <DataFrame>,
-            "손익계산서y": <DataFrame>,
-            ...
-        }
-    """
     now = datetime.now(timezone.utc)
     document = {"코드": code, "날짜": now}
+
     for page, df in data.items():
         if isinstance(df, pd.DataFrame):
-            document[page] = df.where(pd.notnull(df), None).to_dict(orient="records")
+            # NaN을 None으로 안전하게 변환
+            cleaned = df.replace({np.nan: None})
+            document[page] = cleaned.to_dict(orient="records")
+
     return document
 
 
@@ -138,7 +125,7 @@ async def save_many(col: str, many_data: dict[str, dict[str, pd.DataFrame]], cli
     return results
 
 
-async def get_latest(col: str, code: str, page: str, client: AsyncIOMotorClient) -> pd.DataFrame | None:
+async def get_latest(col: str, code: str, client: AsyncIOMotorClient) -> C103 | None:
     collection = get_collection(client, DB_NAME, col)
 
     # 최신 날짜 기준으로 정렬하여 1건만 조회
@@ -147,14 +134,17 @@ async def get_latest(col: str, code: str, page: str, client: AsyncIOMotorClient)
         sort=[("날짜", DESCENDING)]
     )
 
-    if not latest_doc or page not in latest_doc:
-        print(f"문서 없음 또는 '{page}' 항목 없음")
+    if not latest_doc:
+        print(f"문서 없음: {code}")
         return None
 
-        # records → DataFrame
-    records = latest_doc[page]
-    df = pd.DataFrame(records)
-    return df
+    latest_doc["_id"] = str(latest_doc["_id"])
+
+    try:
+        return C103(**latest_doc)
+    except Exception as e:
+        print(f"[{code}] C103 파싱 실패: {e}")
+        return None
 
 
 async def has_doc_changed(col: str, code: str, client: AsyncIOMotorClient) -> bool:

db2_hj3415/nfs/c101.py

@@ -1,9 +1,10 @@
+from typing import Literal
+
 from pymongo import ASCENDING, UpdateOne, DESCENDING
 from motor.motor_asyncio import AsyncIOMotorClient
 from datetime import datetime, timezone
-import pandas as pd
 
-from db2_hj3415.nfs import DATE_FORMAT, DB_NAME
+from db2_hj3415.nfs import DATE_FORMAT, DB_NAME, C101
 from db2_hj3415.common.db_ops import get_collection
 from utils_hj3415 import setup_logger
 
@@ -91,7 +92,7 @@ async def save_many(many_data: dict[str, dict | None], client: AsyncIOMotorClien
     return {"inserted": inserted, "updated": updated}
 
 
-async def get_latest(code: str, client: AsyncIOMotorClient) -> dict | None:
+async def get_latest(code: str, client: AsyncIOMotorClient) -> C101 | None:
     collection = get_collection(client, DB_NAME, COL_NAME)
     doc = await collection.find_one(
         {"코드": code},
@@ -99,26 +100,45 @@ async def get_latest(code: str, client: AsyncIOMotorClient) -> dict | None:
     )
 
     if doc:
-        doc.pop("_id", None)
-        return doc
+        doc["_id"] = str(doc["_id"])
+        mylogger.debug(doc)
+        return C101(**doc)
     else:
         print(f"데이터 없음: {code}")
         return None
 
 
-async def get_all_as_df(code: str, client: AsyncIOMotorClient) -> pd.DataFrame | None:
+SortOrder = Literal["asc", "desc"]
+
+async def get_all_data(code: str, client: AsyncIOMotorClient, sort: SortOrder = 'asc') -> list[C101]:
+    """
+    지정한 종목 코드의 C101 도큐먼트 전체를 날짜 기준으로 정렬하여 반환합니다.
+
+    Args:
+        code (str): 조회할 종목 코드 (예: "005930").
+        client (AsyncIOMotorClient): 비동기 MongoDB 클라이언트 인스턴스.
+        sort (Literal["asc", "desc"], optional): 날짜 정렬 방식.
+            - "asc": 오름차순 (과거 → 최신)
+            - "desc": 내림차순 (최신 → 과거)
+            기본값은 "asc".
+
+    Returns:
+        list[C101]: 정렬된 C101 모델 리스트.
+                    문서가 없을 경우 빈 리스트를 반환합니다.
+    """
     collection = get_collection(client, DB_NAME, COL_NAME)
-    cursor = collection.find({"코드": code}).sort("날짜", ASCENDING)
+    sort_order = ASCENDING if sort == "asc" else DESCENDING
+    cursor = collection.find({"코드": code}).sort("날짜", sort_order)
     docs = await cursor.to_list(length=None)
 
     if not docs:
         print(f"[{code}] 관련 문서 없음")
-        return None
+        return []
 
-    # _id 필드는 문자열로 변환하거나 제거
+    result: list[C101] = []
     for doc in docs:
-        doc.pop("_id", None)
+        doc["_id"] = str(doc["_id"])  # ObjectId → str (C101에서 id: str)
+        result.append(C101(**doc))
 
-    df = pd.DataFrame(docs)
-    return df
+    return result
 

db2_hj3415/nfs/models.py

@@ -0,0 +1,74 @@
+from pydantic import BaseModel, Field, field_serializer, ConfigDict
+from datetime import datetime
+
+class C101(BaseModel):
+    id: str | None = Field(alias="_id")
+    날짜: datetime
+    코드: str
+    bps: int | None
+    eps: int | None
+    pbr: float | None
+    per: float | None
+    개요: str | None
+    거래대금: int | None
+    거래량: int | None
+    발행주식: int | None
+    배당수익률: float | None
+    베타52주: float | None
+    수익률: float | None
+    수익률1M: float | None
+    수익률1Y: float | None
+    수익률3M: float | None
+    수익률6M: float | None
+    시가총액: int | None
+    업종: str | None
+    업종per: float | None
+    외국인지분율: float | None
+    유동비율: float | None
+    전일대비: int | None
+    종목명: str | None
+    주가: int | None
+    최고52: int | None
+    최저52: int | None
+
+    @field_serializer("날짜")
+    def serialize_날짜(self, value: datetime) -> str:
+        return value.isoformat()
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        str_strip_whitespace=True,
+    )
+
+class C103재무항목y(BaseModel):
+    항목: str
+    전년대비: float | None
+    전년대비_1: float | None = Field(default=None, alias="전년대비 1")
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        extra="allow"
+    )
+
+class C103재무항목q(BaseModel):
+    항목: str
+    전분기대비: float | None
+
+    model_config = ConfigDict(extra="allow")  # 나머지 키들 허용
+
+class C103(BaseModel):
+    id: str = Field(alias="_id")
+    코드: str
+    날짜: datetime
+    손익계산서q: list[C103재무항목q]
+    손익계산서y: list[C103재무항목y]
+    재무상태표q: list[C103재무항목q]
+    재무상태표y: list[C103재무항목y]
+    현금흐름표q: list[C103재무항목q]
+    현금흐름표y: list[C103재무항목y]
+
+    @field_serializer("날짜")
+    def serialize_date(self, v: datetime) -> str:
+        return v.isoformat()
+
+    model_config = ConfigDict(populate_by_name=True)

db2_hj3415/redis_manager.py

@@ -0,0 +1,16 @@
+from db2_hj3415.common import connection
+import json
+
+async def get_or_set_cache(key, ttl, fetch_func, force_refresh=False):
+    redis = await connection.get_redis()
+    if not force_refresh:
+        cached = await redis.get(key)
+        if cached:
+            return json.loads(cached)
+
+    result = await fetch_func()
+    if result:
+        await redis.setex(key, ttl, json.dumps(result))
+    return result
+
+

{db2_hj3415-0.1.2.dist-info → db2_hj3415-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: db2_hj3415
-Version: 0.1.2
+Version: 0.1.3
 Summary: Gathering the stock data by playwright
 Author-email: Hyungjin Kim <hj3415@gmail.com>
 Description-Content-Type: text/markdown
@@ -10,6 +10,8 @@ Requires-Dist: pandas
 Requires-Dist: pandas-stubs
 Requires-Dist: deepdiff
 Requires-Dist: utils_hj3415>=3.2.3
+Requires-Dist: redis
+Requires-Dist: pydantic
 Project-URL: Home, https://www.hyungjin.kr
 
 ### db2-hj3415

{db2_hj3415-0.1.2.dist-info → db2_hj3415-0.1.3.dist-info}/RECORD

@@ -1,10 +1,11 @@
 db2_hj3415/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+db2_hj3415/redis_manager.py,sha256=yc8dxEwfhz9k4qwWRnUyhIfuPBHdqg35sL2w1lhG0_4,411
 db2_hj3415/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 db2_hj3415/cli/db.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 db2_hj3415/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-db2_hj3415/common/connection.py,sha256=-pKXNhzlUY4gd9L-cepcvvCilZfnVcjEhxTko7_0aHg,443
+db2_hj3415/common/connection.py,sha256=QpjDtDHy6By0MCj81z5upJkWeuIgqeIsbXsihHcpKX4,774
 db2_hj3415/common/db_ops.py,sha256=CajXob5FofIzsuyFvtlOEo1UkdYMfsLUwKDmbb29Kas,212
-db2_hj3415/common/utils.py,sha256=bV5NiQU9t5SSTsldaDUMJ_Z-97o1fu-QBY-xgVhEqWM,39
+db2_hj3415/common/utils.py,sha256=uL5EqR9ZPkeoGex983Mhwl7CckIfZtGGlQA9mIsl8uY,235
 db2_hj3415/mi/__init__.py,sha256=4XIwdkLfdUCiq2zLqCnR5ypuI45nzX02qez80xWQ70A,159
 db2_hj3415/mi/_ops.py,sha256=Xm2ZpnKxAymIieut8JyK3epHED8uMlhO77ScACfoB7g,3988
 db2_hj3415/mi/aud.py,sha256=w4w4EC0hn6kKHjNkeIUL5ZsvHH4IzRGBpTKRptHapVY,765
@@ -18,17 +19,17 @@ db2_hj3415/mi/sp500.py,sha256=2OFCo6SxXgLijOGLQhV9Ygh0OR10IviGXI0EjKcwfOI,800
 db2_hj3415/mi/usdidx.py,sha256=cT6w-Y-Ysv0KI9yeFqDQYCdT0KPElwn8IZ0JF5oZ_MA,550
 db2_hj3415/mi/usdkrw.py,sha256=QjcHqFSpSgyzI5lzRfYycNUzolzM-ikOvPDFy4FPadM,876
 db2_hj3415/mi/wti.py,sha256=wMoS5yHGOlUS2b2P7Eok5U_59eehYXQGfqWa56J_dkk,768
-db2_hj3415/nfs/__init__.py,sha256=tl0pk2ZNaXqlCFyBA0GgJm6f0IYMBXZfPzaOFMLC-Q4,193
-db2_hj3415/nfs/_c10346.py,sha256=dDSsD6O1pe9ycMTGZzBHoo5TBVpCaSt_NilW3h2QrX4,7470
+db2_hj3415/nfs/__init__.py,sha256=w5QUgr_qWQNHRVcLrT8G8Rx6pNry2PnHfyezBDI5D2A,229
+db2_hj3415/nfs/_c10346.py,sha256=ni2Nrqxwuuy4qYTtSpodFQcHPeGTHnR5-kQtsw1x1UU,6699
 db2_hj3415/nfs/_ops.py,sha256=lqrBBhEFcPupB2dQBXZU-Gftvd9dYTlmgJGTb5LdX-o,1193
-db2_hj3415/nfs/c101.py,sha256=O3BUftcDhciaWRC63-7_SxTpD-cOWUDWDCla0D33s6w,4014
+db2_hj3415/nfs/c101.py,sha256=ORCNXr3pq43zn4naSnyu1erDxFmDc2HLpXO19gv0KNo,4853
 db2_hj3415/nfs/c103.py,sha256=n5xwq8Ire5nBslFrZuwfNHTJZDRZh-_UnbU1KhHFEAM,1479
 db2_hj3415/nfs/c104.py,sha256=QpYOct3JCoX6scyM98YNO_9J_RB3T_odkXa5186UvfI,1479
 db2_hj3415/nfs/c106.py,sha256=-kJ90dzUzyqamjBPxhihOjl9rw0Swfb0bVoThApCBfI,1479
 db2_hj3415/nfs/c108.py,sha256=vmm_vaxEixDZeOWMsfgLzAj4LvlcyCqe_V4E9WnIVHo,2604
 db2_hj3415/nfs/dart.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-db2_hj3415/redis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-db2_hj3415-0.1.2.dist-info/entry_points.txt,sha256=JAGFsxKtvbNgaKCSKo-QRYwCyToabWmdRW0MZWtg9kg,45
-db2_hj3415-0.1.2.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
-db2_hj3415-0.1.2.dist-info/METADATA,sha256=SHea9_aQ5Wplv-KKlkaPhQA9_XV_ns1ZvXKdeSJSECw,664
-db2_hj3415-0.1.2.dist-info/RECORD,,
+db2_hj3415/nfs/models.py,sha256=fJ5ZizdAXTUOdovHVpcZ87PELjmXKFnBeddkiM0u5IE,2053
+db2_hj3415-0.1.3.dist-info/entry_points.txt,sha256=JAGFsxKtvbNgaKCSKo-QRYwCyToabWmdRW0MZWtg9kg,45
+db2_hj3415-0.1.3.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
+db2_hj3415-0.1.3.dist-info/METADATA,sha256=Jhv1_XJPNrsXny3QBc-q2O_QnNCuSr_hsuVUzrbjsyc,709
+db2_hj3415-0.1.3.dist-info/RECORD,,