hccinfhir 0.2.4__tar.gz → 0.2.5__tar.gz

{hccinfhir-0.2.4 → hccinfhir-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: hccinfhir
-Version: 0.2.4
+Version: 0.2.5
 Summary: HCC Algorithm for FHIR Resources
 Project-URL: Homepage, https://github.com/mimilabs/hccinfhir
 Project-URL: Issues, https://github.com/mimilabs/hccinfhir/issues

{hccinfhir-0.2.4 → hccinfhir-0.2.5}/hccinfhir/datamodels.py

@@ -1,5 +1,6 @@
 from pydantic import BaseModel, Field
-from typing import List, Optional, Literal, Dict, Set, TypedDict, Union
+from typing import List, Optional, Literal, Dict, Set, TypedDict, Union, Any
+from datetime import date
 
 # Define Model Name literal type
 ModelName = Literal[
@@ -203,6 +204,21 @@ class HCPCoveragePeriod(BaseModel):
     hcp_status: Optional[str] = None
     aid_codes: Optional[str] = None  # REF*CE composite
 
+    def model_dump_with_dates(self, **kwargs) -> Dict[str, Any]:
+        """Return dict with date fields as date objects instead of strings.
+
+        Args:
+            **kwargs: Additional arguments passed to model_dump()
+
+        Returns:
+            Dict with start_date and end_date as date objects (if present)
+        """
+        data = self.model_dump(**kwargs)
+        for field in ('start_date', 'end_date'):
+            if data.get(field):
+                data[field] = date.fromisoformat(data[field])
+        return data
+
 
 class EnrollmentData(BaseModel):
     """
@@ -372,4 +388,47 @@ class EnrollmentData(BaseModel):
     amount: Optional[float] = None
 
     # HCP History
-    hcp_history: List[HCPCoveragePeriod] = []
+    hcp_history: List[HCPCoveragePeriod] = []
+
+    def model_dump_with_dates(self, **kwargs) -> Dict[str, Any]:
+        """Return dict with date fields as date objects instead of strings.
+
+        Converts all YYYY-MM-DD string date fields to date objects.
+        Also converts dates in nested hcp_history items.
+
+        Args:
+            **kwargs: Additional arguments passed to model_dump()
+
+        Returns:
+            Dict with date fields as date objects (if present)
+
+        Example:
+            >>> enrollment = extract_enrollment_834(content)[0]
+            >>> data = enrollment.model_dump_with_dates()
+            >>> isinstance(data['dob'], date)  # True
+        """
+        data = self.model_dump(**kwargs)
+
+        # EnrollmentData date fields
+        date_fields = (
+            'report_date',
+            'dob',
+            'death_date',
+            'coverage_start_date',
+            'coverage_end_date',
+            'fame_card_issue_date',
+            'fame_redetermination_date',
+            'fame_death_date',
+        )
+        for field in date_fields:
+            if data.get(field):
+                data[field] = date.fromisoformat(data[field])
+
+        # Convert dates in hcp_history items
+        if data.get('hcp_history'):
+            for hcp in data['hcp_history']:
+                for field in ('start_date', 'end_date'):
+                    if hcp.get(field):
+                        hcp[field] = date.fromisoformat(hcp[field])
+
+        return data

{hccinfhir-0.2.4 → hccinfhir-0.2.5}/hccinfhir/extractor_834.py

@@ -619,8 +619,8 @@ def parse_834_enrollment(segments: List[List[str]], source: str = None, report_d
             # Strip state suffix from city if embedded
             if city and state and city.upper().endswith(' ' + state.upper()):
                 city = city[:-len(state)-1].strip()
-            member.city = city.lower() if city else None
-            member.state = state.lower() if state else None
+            member.city = city
+            member.state = state
             member.zip = get_segment_value(segment, 3)
             # County code
             if len(segment) > 6 and segment[5] == 'CY' and not member.fame_county_id:

{hccinfhir-0.2.4 → hccinfhir-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hccinfhir"
-version = "0.2.4"
+version = "0.2.5"
 authors = [
   { name="Yubin Park", email="yubin.park@mimilabs.ai" },
 ]