assembly-api-client 1.2.0__tar.gz → 1.2.2__tar.gz

{assembly_api_client-1.2.0 → assembly_api_client-1.2.2}/.github/workflows/update_client.yml

@@ -56,18 +56,19 @@ jobs:
 
       - name: Set up uv
         uses: astral-sh/setup-uv@b5f58b2abc5763ade55e4e9d0fe52cd1ff7979ca
+        with:
+          enable-cache: true
 
       - name: Install Dependencies
         run: |
-          uv pip install --system -e .
-          uv pip install --system httpx openpyxl pydantic tenacity typer rich platformdirs
+          uv sync --all-extras --dev
 
       - name: Run Update Script
         env:
           ASSEMBLY_API_KEY: ${{ secrets.ASSEMBLY_API_KEY }}
         run: |
           chmod +x scripts/update_client.sh
-          ./scripts/update_client.sh
+          uv run scripts/update_client.sh
 
       - name: Check for changes
         id: git-check
@@ -78,7 +79,7 @@ jobs:
         if: steps.git-check.outputs.changes == 'true'
         id: bump-version
         run: |
-          python scripts/bump_version.py
+          uv run scripts/bump_version.py
           NEW_VERSION=$(grep -oP 'version = "\K[^"]+' pyproject.toml)
           echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
 

{assembly_api_client-1.2.0 → assembly_api_client-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: assembly-api-client
-Version: 1.2.0
+Version: 1.2.2
 Summary: A Python client for the Korean National Assembly Open API
 Author-email: StatPan <statpan@naver.com>
 License: MIT

{assembly_api_client-1.2.0 → assembly_api_client-1.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "assembly-api-client"
-version = "1.2.0"
+version = "1.2.2"
 description = "A Python client for the Korean National Assembly Open API"
 readme = "README.md"
 requires-python = ">=3.8"

{assembly_api_client-1.2.0 → assembly_api_client-1.2.2}/scripts/generate_fixtures.py

@@ -14,29 +14,17 @@ logger = logging.getLogger(__name__)
 
 # Load key from env
 API_KEY = os.getenv("ASSEMBLY_API_KEY")
-if not API_KEY:
-    try:
-        with open(".env") as f:
-            for line in f:
-                if line.startswith("ASSEMBLY_API_KEY="):
-                    API_KEY = line.strip().split("=")[1]
-                    break
-    except FileNotFoundError:
-        pass
-
-if not API_KEY:
-    raise ValueError("ASSEMBLY_API_KEY not found")
 
 FIXTURE_DIR = Path("tests/fixtures")
 FIXTURE_DIR.mkdir(parents=True, exist_ok=True)
 
 
-async def fetch_fixture(client: AssemblyAPIClient, service: Service):
+async def fetch_fixture(client: AssemblyAPIClient, service: Service, force: bool = False):
     filename = f"{service.name}.json"
     filepath = FIXTURE_DIR / filename
 
-    if filepath.exists():
-        logger.info(f"Skipping {service.name} (already exists)")
+    if not force and filepath.exists():
+        # logger.info(f"Skipping {service.name} (already exists)")
         return
 
     logger.info(f"Fetching {service.name}...")
@@ -89,39 +77,29 @@ def main(
     force: bool = typer.Option(False, help="Force update existing fixtures"),
     limit: int = typer.Option(None, help="Limit number of fixtures to fetch"),
 ):
-    # Load API Key
-    api_key = os.getenv("ASSEMBLY_API_KEY")
-    if not api_key:
-        # Try .env
+    # Use the global API_KEY or try to load it from .env
+    global API_KEY
+    if not API_KEY:
         try:
             from dotenv import load_dotenv
 
             load_dotenv()
-            api_key = os.getenv("ASSEMBLY_API_KEY")
+            API_KEY = os.getenv("ASSEMBLY_API_KEY")
         except ImportError:
             pass
 
-    if not api_key:
+    if not API_KEY:
         logger.error("ASSEMBLY_API_KEY not found. Cannot generate fixtures.")
         return
 
     async def run():
-        async with AssemblyAPIClient(api_key=api_key) as client:
+        async with AssemblyAPIClient(api_key=API_KEY) as client:
             tasks = []
             sem = asyncio.Semaphore(5)
 
             async def bound_fetch(s):
                 async with sem:
-                    # Pass force flag if we modify fetch_fixture to accept it
-                    # For now, let's handle force logic here or in fetch_fixture
-                    filename = f"{s.name}.json"
-                    filepath = FIXTURE_DIR / filename
-
-                    if not force and filepath.exists():
-                        # logger.info(f"Skipping {s.name} (already exists)")
-                        return
-
-                    await fetch_fixture(client, s)
+                    await fetch_fixture(client, s, force=force)
                     await asyncio.sleep(0.1)
 
             services = list(Service)

{assembly_api_client-1.2.0 → assembly_api_client-1.2.2}/src/assembly_client/__init__.py

@@ -2,4 +2,4 @@
 Assembly API Client Library
 """
 
-__version__ = "1.2.0"
+__version__ = "1.2.2"

{assembly_api_client-1.2.0 → assembly_api_client-1.2.2}/src/assembly_client/api.py

@@ -142,7 +142,11 @@ class AssemblyAPIClient:
         retry=retry_if_exception(_is_retryable_error),
     )
     async def get_data(
-        self, service_id_or_name: str | Service, params: dict[str, Any] | BaseModel = None, fmt: str = "json"
+        self,
+        service_id_or_name: str | Service,
+        params: dict[str, Any] | BaseModel = None,
+        fmt: str = "json",
+        raw: bool = False,
     ) -> Union[dict[str, Any], str, BaseModel, list[BaseModel]]:
         """
         Fetch data from the API using dynamic endpoint resolution.
@@ -151,9 +155,10 @@ class AssemblyAPIClient:
             service_id_or_name: The API service ID, Service Name, or Service Enum member.
             params: Query parameters.
             fmt: Response format ('json' or 'xml').
+            raw: If True, return raw dict without Pydantic model conversion.
 
         Returns:
-            Parsed JSON dict, raw XML string, or Pydantic Model (if available).
+            Parsed JSON dict, raw XML string, or Pydantic Model (if available and raw=False).
 
         Raises:
             SpecParseError: If endpoint resolution fails
@@ -198,8 +203,8 @@ class AssemblyAPIClient:
                 data = response.json()
                 self._check_api_error(data, endpoint)
 
-                # Try to convert to Pydantic model
-                if HAS_GENERATED_TYPES and service_id in MODEL_MAP:
+                # Try to convert to Pydantic model (skip if raw=True)
+                if not raw and HAS_GENERATED_TYPES and service_id in MODEL_MAP:
                     try:
                         model_cls = MODEL_MAP[service_id]
                         # The data structure is usually {endpoint: [{head: ...}, {row: [...]}]}
@@ -277,7 +282,7 @@ class AssemblyAPIClient:
             try:
                 # Set pagination params for this page
                 page_params = {**params, "pIndex": p_index, "pSize": p_size}
-                data = await self.get_data(service_id_or_name, page_params)
+                data = await self.get_data(service_id_or_name, page_params, raw=True)
 
                 # get_data returns dict for JSON responses
                 if not isinstance(data, dict):

{assembly_api_client-1.2.0 → assembly_api_client-1.2.2}/src/assembly_client/codegen/generator.py

@@ -51,17 +51,17 @@ def generate_services_enum(cache_dir: Path) -> str:
         # Sanitize name for Python identifier
         # Remove spaces, special chars
         safe_name = re.sub(r"[^a-zA-Z0-9가-힣]", "_", name)
-                # Remove leading/trailing underscores and collapse multiple underscores
-                safe_name = re.sub(r"_+", "_", safe_name).strip("_")
-        
-                # If it starts with digit, prefix with S to avoid starting with underscore (private)
-                if safe_name and safe_name[0].isdigit():
-                    safe_name = f"S{safe_name}"
-        
-                if not safe_name:
-                    safe_name = f"Service_{service_id}"
-        
-                lines.append(f'    {safe_name} = "{service_id}"')
+        # Remove leading/trailing underscores and collapse multiple underscores
+        safe_name = re.sub(r"_+", "_", safe_name).strip("_")
+
+        # If it starts with digit, prefix with S to avoid starting with underscore (private)
+        if safe_name and safe_name[0].isdigit():
+            safe_name = f"S{safe_name}"
+
+        if not safe_name:
+            safe_name = f"Service_{service_id}"
+
+        lines.append(f'    {safe_name} = "{service_id}"')
     return "\n".join(lines)
 
 

{assembly_api_client-1.2.0 → assembly_api_client-1.2.2}/src/assembly_client/generated/models.py

@@ -322,6 +322,8 @@ class Model_OK7XM1000938DS17215(BaseModel):
     PROPOSER: Union[str, int, float, None] = Field(None, description="제안자", alias="PROPOSER")
     MEMBER_LIST: Union[str, int, float, None] = Field(None, description="제안자목록링크", alias="MEMBER_LIST")
     LAW_PROC_DT: Union[str, int, float, None] = Field(None, description="법사위처리일", alias="LAW_PROC_DT")
+    LAW_PROC_RESULT_CD: Union[str, int, float, None] = Field(None, description="법사위처리결과", alias="LAW_PROC_RESULT_CD")
+    RST_MONA_CD: Union[str, int, float, None] = Field(None, description="대표발의자코드", alias="RST_MONA_CD")
     LAW_PRESENT_DT: Union[str, int, float, None] = Field(None, description="법사위상정일", alias="LAW_PRESENT_DT")
     LAW_SUBMIT_DT: Union[str, int, float, None] = Field(None, description="법사위회부일", alias="LAW_SUBMIT_DT")
     CMT_PROC_RESULT_CD: Union[str, int, float, None] = Field(None, description="소관위처리결과", alias="CMT_PROC_RESULT_CD")
@@ -330,9 +332,9 @@ class Model_OK7XM1000938DS17215(BaseModel):
     COMMITTEE_DT: Union[str, int, float, None] = Field(None, description="소관위회부일", alias="COMMITTEE_DT")
     PROC_DT: Union[str, int, float, None] = Field(None, description="의결일", alias="PROC_DT")
     COMMITTEE_ID: Union[str, int, float, None] = Field(None, description="소관위원회ID", alias="COMMITTEE_ID")
-    PUBL_PROPOSER: Union[str, int, float, None] = Field(None, description="공동발의자", alias="PUBL_PROPOSER")
-    LAW_PROC_RESULT_CD: Union[str, int, float, None] = Field(None, description="법사위처리결과", alias="LAW_PROC_RESULT_CD")
+    PUBL_MONA_CD: Union[str, int, float, None] = Field(None, description="공동발의자코드", alias="PUBL_MONA_CD")
     RST_PROPOSER: Union[str, int, float, None] = Field(None, description="대표발의자", alias="RST_PROPOSER")
+    PUBL_PROPOSER: Union[str, int, float, None] = Field(None, description="공동발의자", alias="PUBL_PROPOSER")
 
 class Params_OK7XM1000938DS17215(BaseModel):
     """Request parameters for OK7XM1000938DS17215"""

{assembly_api_client-1.2.0 → assembly_api_client-1.2.2}/tests/test_get_all_data.py

@@ -61,7 +61,7 @@ async def test_get_all_data_multiple_pages(client):
     """Test pagination across multiple pages."""
     call_count = 0
     
-    async def mock_get_data(service_id, params):
+    async def mock_get_data(service_id, params, **kwargs):
         nonlocal call_count
         call_count += 1
         if call_count == 1:

{assembly_api_client-1.2.0 → assembly_api_client-1.2.2}/uv.lock

@@ -58,7 +58,7 @@ wheels = [
 
 [[package]]
 name = "assembly-api-client"
-version = "1.0.7"
+version = "1.2.0"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },