chore: BaseModel 필드로 TAGOClient를 받도록 수정

Author: hyuntroll

.gitignore

@@ -7,3 +7,4 @@ caches/cache.pkl
 .vscodeoutput.json
 
 
+tagoapi/caches/station.pkl

package-lock.json

@@ -156,9 +156,13 @@ def _fetch_and_convert(
         response = parse_metadata(self._get(endpoint, params))
         if not response: 
             return None 
+        
+        ## Convert to List
         if isinstance(response, list):
+
             if not is_cache:
-                return convert(response, model.from_list)
+                return convert(response, model.from_list, self)
+            
             result = []
             for v in response:
                 key = cache_key.generate_key(v)
@@ -171,8 +175,10 @@ def _fetch_and_convert(
                     cache.save(key, parsed_obj, self.CACHE_TTL)
 
             return result
-
+        
+        ## Covert to Dict
         else:
+            
             if is_cache: 
                 key = cache_key.generate_key(response)
                 cached = cache.get(key)

tagoapi/caches/station.pkl

@@ -33,14 +33,3 @@ class CacheNotFoundError(TAGOAPIError):
     """캐시파일을 불러오지 못할 때"""
     pass
 
-class TAGORequestError(TAGOAPIError):
-    """요청 실패 (http 에러, 타임아웃 등)"""
-    def __init__(self, message: str, status_code: int | None ):
-        super().__init__(message)
-        self.status_code = status_code
-
-class TAGOResponseError(TAGOAPIError):
-    """ 요청 오류 """
-    def __init__(self, message: str, status_code: int | None ):
-        super().__init__(message)
-        self.status_code = status_code

tagoapi/client.py

@@ -1,19 +1,22 @@
-
+from typing import TYPE_CHECKING
+if TYPE_CHECKING:
+    from tagoapi import TAGOClient
 
 class BaseModel:
     cache_key = "BaseModel:<id>"
-    def __init__(self): ...
-
+    def __init__(self, client: TAGOClient):
+        self._client = client
+          
     def to_dict(self) -> dict: ...
 
     def to_dict(self):
         return vars(self)
 
     @classmethod
-    def from_dict(cls, data:dict) -> "BaseModel": ...
+    def from_dict(cls, data: dict, client: TAGOClient) -> "BaseModel": ...
 
     @classmethod
-    def from_list(cls, data:list) -> list["BaseModel"]:
-        return [cls.from_dict(v) for v in data]
+    def from_list(cls, data: list, client: TAGOClient) -> list["BaseModel"]:
+        return [cls.from_dict(v, client) for v in data]
 
 

tagoapi/exceptions.py

@@ -18,9 +18,11 @@ def __init__(
         startNodeNm: str = None,
         endvehicletime: int = None,
         startvehicletime: int = None,
+        client = None
         #TODO: 정류장 리스트도 넣으면 좋을 듯 합니당
     ):
-
+        super().__init__(client)
+        
         self.routeId = routeId
         self.routeNo = routeNo
         self.routeTp = routeTp

tagoapi/models/BaseModel.py

@@ -45,5 +45,5 @@ def from_dict(cls, data: dict) -> "Vehicle":
         )
 
     @classmethod
-    def from_list(cls, data:list[dict]) -> list["Vehicle"]:
+    def from_list(cls, data: list[dict]) -> list["Vehicle"]:
         return [ cls.from_dict(vehicle) for vehicle in data]

tagoapi/models/Route.py

@@ -14,8 +14,13 @@ def __init__(self, path: str = DEFAULT_CACHE_PATH):
 
     def _load(self) -> dict:
         if os.path.exists(self.path):
-            with open(self.path, 'rb') as f:
-                return pickle.load(f)
+            try:
+                
+                with open(self.path, 'rb') as f:
+                    return pickle.load(f)
+                
+            except Exception:
+                return {}
         return {}
 
     def save(self, key: str, value: dict, ttl: int = 86400) -> bool:

tagoapi/models/Vehicle.py

@@ -1,8 +1,10 @@
-from typing import Union, Callable, TypeVar, Any
+from typing import TYPE_CHECKING, Union, Callable, TypeVar, Any
+if TYPE_CHECKING:
+    from tagoapi import TAGOClient
 T = TypeVar('T', dict, list) # list, dict으로 매개변수 받을 때
 U = TypeVar('U', dict[str], list) # list, dict으로 반환할 때
 
-def convert(res: T, converter: Callable[[T], U]) -> U:
+def convert(res: T, converter: Callable[[T, TAGOClient], U], _client: TAGOClient) -> U:
     if not res:
         return None
-    return converter(res)
+    return converter(res, _client)