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

db2_hj3415/common/utils.py

@@ -4,4 +4,21 @@ 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")
+    return df.replace({np.nan: None}).to_dict(orient="records")
+
+import json
+from bson import json_util
+from pydantic import BaseModel
+
+def pretty_print(obj):
+    if isinstance(obj, BaseModel):
+        # Pydantic 모델이면 dict로 변환
+        data = obj.model_dump(by_alias=True)
+    elif isinstance(obj, list) and all(isinstance(o, BaseModel) for o in obj):
+        # 리스트 안에 BaseModel만 있다면 변환
+        data = [o.model_dump(by_alias=True) for o in obj]
+    else:
+        # 일반 dict나 기타 객체
+        data = obj
+
+    print(json.dumps(data, indent=2, ensure_ascii=False, default=json_util.default))

db2_hj3415/nfs/_c10346.py

@@ -1,10 +1,12 @@
+from unittest import case
+
 from deepdiff import DeepDiff
 from pymongo import ASCENDING, DESCENDING
 from motor.motor_asyncio import AsyncIOMotorClient
 import pprint
 import pandas as pd
 import json
-from db2_hj3415.nfs import DB_NAME, C103
+from db2_hj3415.nfs import DB_NAME, C103, C104, C106
 from db2_hj3415.common.db_ops import get_collection
 from datetime import datetime, timezone
 import numpy as np
@@ -125,7 +127,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, client: AsyncIOMotorClient) -> C103 | None:
+async def get_latest(col: str, code: str, client: AsyncIOMotorClient) -> C103 | C104 | C106 | None:
     collection = get_collection(client, DB_NAME, col)
 
     # 최신 날짜 기준으로 정렬하여 1건만 조회
@@ -141,7 +143,14 @@ async def get_latest(col: str, code: str, client: AsyncIOMotorClient) -> C103 |
     latest_doc["_id"] = str(latest_doc["_id"])
 
     try:
-        return C103(**latest_doc)
+        match col:
+            case 'c103':
+                return C103(**latest_doc)
+            case 'c104':
+                return C104(**latest_doc)
+            case 'c106':
+                return C106(**latest_doc)
+
     except Exception as e:
         print(f"[{code}] C103 파싱 실패: {e}")
         return None

db2_hj3415/nfs/c103.py

@@ -1,7 +1,7 @@
 from motor.motor_asyncio import AsyncIOMotorClient
 import pandas as pd
 
-from db2_hj3415.nfs import _c10346
+from db2_hj3415.nfs import _c10346, C103
 from utils_hj3415 import setup_logger
 
 mylogger = setup_logger(__name__, 'WARNING')
@@ -17,8 +17,8 @@ async def save_many(many_data: dict[str, dict[str, pd.DataFrame]], client: Async
     return await _c10346.save_many(COL_NAME, many_data, client)
 
 
-async def get_latest(code: str, page: str, client: AsyncIOMotorClient) -> pd.DataFrame | None:
-    return await _c10346.get_latest(COL_NAME, code, page, client)
+async def get_latest(code: str, client: AsyncIOMotorClient) -> C103 | None:
+    return await _c10346.get_latest(COL_NAME, code, client)
 
 
 async def has_doc_changed(code: str, client: AsyncIOMotorClient) -> bool:

db2_hj3415/nfs/c104.py

@@ -1,7 +1,7 @@
 from motor.motor_asyncio import AsyncIOMotorClient
 import pandas as pd
 
-from db2_hj3415.nfs import _c10346
+from db2_hj3415.nfs import _c10346, C104
 from utils_hj3415 import setup_logger
 
 mylogger = setup_logger(__name__, 'WARNING')
@@ -17,8 +17,8 @@ async def save_many(many_data: dict[str, dict[str, pd.DataFrame]], client: Async
     return await _c10346.save_many(COL_NAME, many_data, client)
 
 
-async def get_latest(code: str, page: str, client: AsyncIOMotorClient) -> pd.DataFrame | None:
-    return await _c10346.get_latest(COL_NAME, code, page, client)
+async def get_latest(code: str, client: AsyncIOMotorClient) -> C104 | None:
+    return await _c10346.get_latest(COL_NAME, code, client)
 
 
 async def has_doc_changed(code: str, client: AsyncIOMotorClient) -> bool:

db2_hj3415/nfs/c106.py

@@ -1,7 +1,7 @@
 from motor.motor_asyncio import AsyncIOMotorClient
 import pandas as pd
 
-from db2_hj3415.nfs import _c10346
+from db2_hj3415.nfs import _c10346, C106
 from utils_hj3415 import setup_logger
 
 mylogger = setup_logger(__name__, 'WARNING')
@@ -17,8 +17,8 @@ async def save_many(many_data: dict[str, dict[str, pd.DataFrame]], client: Async
     return await _c10346.save_many(COL_NAME, many_data, client)
 
 
-async def get_latest(code: str, page: str, client: AsyncIOMotorClient) -> pd.DataFrame | None:
-    return await _c10346.get_latest(COL_NAME, code, page, client)
+async def get_latest(code: str, client: AsyncIOMotorClient) -> C106 | None:
+    return await _c10346.get_latest(COL_NAME, code, client)
 
 
 async def has_doc_changed(code: str, client: AsyncIOMotorClient) -> bool:

db2_hj3415/nfs/c108.py

@@ -1,9 +1,9 @@
 from motor.motor_asyncio import AsyncIOMotorClient
-from pymongo import ASCENDING, UpdateOne
+from pymongo import ASCENDING, UpdateOne, DESCENDING
 import pandas as pd
-from datetime import datetime, timezone
+from datetime import datetime, timezone, timedelta
 
-from db2_hj3415.nfs import DATE_FORMAT, DB_NAME
+from db2_hj3415.nfs import DATE_FORMAT, DB_NAME, C108
 from db2_hj3415.common.db_ops import get_collection
 from utils_hj3415 import setup_logger
 
@@ -75,3 +75,37 @@ async def save_many(many_data: dict[str, pd.DataFrame], client: AsyncIOMotorClie
     return total_result
 
 
+async def get_latest(code: str, client: AsyncIOMotorClient, days:int = 30) -> list[C108]:
+    """
+    최근 N일 이내의 C108 리포트 도큐먼트를 조회합니다.
+
+    Args:
+        code (str): 종목 코드 (예: "005930").
+        client (AsyncIOMotorClient): 비동기 MongoDB 클라이언트.
+        days (int, optional): 현재 시점에서 며칠 전까지의 데이터를 조회할지 설정합니다. 기본값은 30일.
+
+    Returns:
+        list[C108]: 조건에 해당하는 C108 도큐먼트 리스트. 일치하는 문서가 없을 경우 빈 리스트를 반환합니다.
+    """
+    collection = get_collection(client, DB_NAME, COL_NAME)
+    now = datetime.now(timezone.utc)
+    cutoff = now - timedelta(days=days)
+
+    cursor = collection.find(
+        {
+            "코드": code,
+            "날짜": {"$gte": cutoff}
+        }
+    ).sort("날짜", DESCENDING)
+
+    docs = await cursor.to_list(length=None)
+    if not docs:
+        return []
+    else:
+        c108s = []
+        for doc in docs:
+            doc["_id"] = str(doc["_id"])
+            c108s.append(C108(**doc))
+        return c108s
+
+

db2_hj3415/nfs/models.py

@@ -40,7 +40,7 @@ class C101(BaseModel):
         str_strip_whitespace=True,
     )
 
-class C103재무항목y(BaseModel):
+class 항목값y(BaseModel):
     항목: str
     전년대비: float | None
     전년대비_1: float | None = Field(default=None, alias="전년대비 1")
@@ -50,25 +50,98 @@ class C103재무항목y(BaseModel):
         extra="allow"
     )
 
-class C103재무항목q(BaseModel):
+class 항목값q(BaseModel):
     항목: str
     전분기대비: float | None
 
-    model_config = ConfigDict(extra="allow")  # 나머지 키들 허용
+    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]
+    손익계산서q: list[항목값q]
+    손익계산서y: list[항목값y]
+    재무상태표q: list[항목값q]
+    재무상태표y: list[항목값y]
+    현금흐름표q: list[항목값q]
+    현금흐름표y: list[항목값y]
+
+    @field_serializer("날짜")
+    def serialize_date(self, v: datetime) -> str:
+        return v.isoformat()
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class C104(BaseModel):
+    id: str = Field(alias="_id")
+    코드: str
+    날짜: datetime
+
+    수익성y: list[항목값y] | None = None
+    성장성y: list[항목값y] | None = None
+    안정성y: list[항목값y] | None = None
+    활동성y: list[항목값y] | None = None
+    가치분석y: list[항목값y] | None = None
+
+    수익성q: list[항목값q] | None = None
+    성장성q: list[항목값q] | None = None
+    안정성q: list[항목값q] | None = None
+    활동성q: list[항목값q] | None = None
+    가치분석q: list[항목값q] | None = None
+
+    @field_serializer("날짜")
+    def serialize_date(self, v: datetime) -> str:
+        return v.isoformat()
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class 기업데이터(BaseModel):
+    항목: str
+    항목2: str
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        extra="allow"
+    )
+
+class C106(BaseModel):
+    id: str = Field(alias="_id")
+    코드: str
+    날짜: datetime
+
+    q: list[기업데이터]
+    y: list[기업데이터]
+
+    @field_serializer("날짜")
+    def serialize_date(self, v: datetime) -> str:
+        return v.isoformat()
+
+    model_config = ConfigDict(populate_by_name=True)
+
+
+class C108(BaseModel):
+    id: str = Field(alias="_id")
+    코드: str
+    날짜: datetime
+
+    제목: str | None = None
+    내용: list[str] | None = None
+    목표가: int | None = None
+    분량: str | None = None
+    작성자: str | None = None
+    제공처: str | None = None
+    투자의견: str | None = None
 
+    # 날짜 필드 ISO 직렬화
     @field_serializer("날짜")
     def serialize_date(self, v: datetime) -> str:
         return v.isoformat()
 
-    model_config = ConfigDict(populate_by_name=True)
+    model_config = ConfigDict(
+        populate_by_name=True,
+        str_strip_whitespace=True
+    )

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: db2_hj3415
-Version: 0.1.3
+Version: 0.1.4
 Summary: Gathering the stock data by playwright
 Author-email: Hyungjin Kim <hj3415@gmail.com>
 Description-Content-Type: text/markdown

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

@@ -1,11 +1,10 @@
 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=QpjDtDHy6By0MCj81z5upJkWeuIgqeIsbXsihHcpKX4,774
 db2_hj3415/common/db_ops.py,sha256=CajXob5FofIzsuyFvtlOEo1UkdYMfsLUwKDmbb29Kas,212
-db2_hj3415/common/utils.py,sha256=uL5EqR9ZPkeoGex983Mhwl7CckIfZtGGlQA9mIsl8uY,235
+db2_hj3415/common/utils.py,sha256=TfbsAR1FWgbuxZUybXRdrFg6QSeJ8DInn6b8aw_NagE,805
 db2_hj3415/mi/__init__.py,sha256=4XIwdkLfdUCiq2zLqCnR5ypuI45nzX02qez80xWQ70A,159
 db2_hj3415/mi/_ops.py,sha256=Xm2ZpnKxAymIieut8JyK3epHED8uMlhO77ScACfoB7g,3988
 db2_hj3415/mi/aud.py,sha256=w4w4EC0hn6kKHjNkeIUL5ZsvHH4IzRGBpTKRptHapVY,765
@@ -20,16 +19,16 @@ 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=w5QUgr_qWQNHRVcLrT8G8Rx6pNry2PnHfyezBDI5D2A,229
-db2_hj3415/nfs/_c10346.py,sha256=ni2Nrqxwuuy4qYTtSpodFQcHPeGTHnR5-kQtsw1x1UU,6699
+db2_hj3415/nfs/_c10346.py,sha256=yKBOA4QkY2eAUMzOiYWz4BB1c4cW6X4s4D2Nj9rAgOA,6939
 db2_hj3415/nfs/_ops.py,sha256=lqrBBhEFcPupB2dQBXZU-Gftvd9dYTlmgJGTb5LdX-o,1193
 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/c103.py,sha256=NY2e_BTfSHkELIEUJ8XhhYdNETQaRGOrF4qNaewB2_E,1460
+db2_hj3415/nfs/c104.py,sha256=aVLchUoxomlthS7FZ0adskBXmxIWQISGfc2EgWkWZDI,1460
+db2_hj3415/nfs/c106.py,sha256=dAVSnEM5E-sJZExMTfqDoQlozTtH05JOtenzbIUdvtQ,1460
+db2_hj3415/nfs/c108.py,sha256=F_kP1HMhpe9E6VKm_m-aDl6PZ-FqVs5-O2_-rU8f34Y,3761
 db2_hj3415/nfs/dart.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-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,,
+db2_hj3415/nfs/models.py,sha256=4RtPkD2DdSd8UuqI8DrJhY2Iyr4UNiCADbTVcqpb3MY,3765
+db2_hj3415-0.1.4.dist-info/entry_points.txt,sha256=JAGFsxKtvbNgaKCSKo-QRYwCyToabWmdRW0MZWtg9kg,45
+db2_hj3415-0.1.4.dist-info/WHEEL,sha256=Dyt6SBfaasWElUrURkknVFAZDHSTwxg3PaTza7RSbkY,100
+db2_hj3415-0.1.4.dist-info/METADATA,sha256=ww11ReGoCpq6kLlnVaHRTTSQpx92oNfR7tnecsWdjJk,709
+db2_hj3415-0.1.4.dist-info/RECORD,,

db2_hj3415/redis_manager.py

@@ -1,16 +0,0 @@
-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
-
-