hccinfhir 0.0.5__tar.gz → 0.0.7__tar.gz

{hccinfhir-0.0.5 → hccinfhir-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: hccinfhir
-Version: 0.0.5
+Version: 0.0.7
 Summary: HCC Algorithm for FHIR Resources
 Project-URL: Homepage, https://github.com/mimilabs/hccinfhir
 Project-URL: Issues, https://github.com/mimilabs/hccinfhir/issues
@@ -128,15 +128,10 @@ hcc_processor = HCCInFHIR(
 )
 
 # Define beneficiary demographics
-demographics = Demographics(
+demographics = {
     age=67,
-    sex='F',
-    dual_elgbl_cd='00',    # Not dual eligible
-    orec='0',              # Old age
-    crec='0',              # Current old age
-    new_enrollee=False,
-    snp=False
-)
+    sex='F'
+}
 
 # Method 1: Process FHIR EOB resources
 raf_result = hcc_processor.run(eob_list, demographics)
@@ -309,8 +304,8 @@ Join us at [mimilabs](https://mimilabs.ai/signup). Reference data available in M
 
 ## Publishing (only for those maintainers...)
 ```bash
-$ hatch build
-$ hatch publish
+$ python3 -m hatch build
+$ python3 -m hatch publish
 ```
 
 ## License

{hccinfhir-0.0.5 → hccinfhir-0.0.7}/README.md

@@ -114,15 +114,10 @@ hcc_processor = HCCInFHIR(
 )
 
 # Define beneficiary demographics
-demographics = Demographics(
+demographics = {
     age=67,
-    sex='F',
-    dual_elgbl_cd='00',    # Not dual eligible
-    orec='0',              # Old age
-    crec='0',              # Current old age
-    new_enrollee=False,
-    snp=False
-)
+    sex='F'
+}
 
 # Method 1: Process FHIR EOB resources
 raf_result = hcc_processor.run(eob_list, demographics)
@@ -295,8 +290,8 @@ Join us at [mimilabs](https://mimilabs.ai/signup). Reference data available in M
 
 ## Publishing (only for those maintainers...)
 ```bash
-$ hatch build
-$ hatch publish
+$ python3 -m hatch build
+$ python3 -m hatch publish
 ```
 
 ## License

{hccinfhir-0.0.5 → hccinfhir-0.0.7}/hccinfhir/datamodels.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from typing import List, Optional, Literal, Dict, Set, TypedDict
+from typing import List, Optional, Literal, Dict, Set, TypedDict, Union
 
 # Define Model Name literal type
 ModelName = Literal[
@@ -67,24 +67,24 @@ class Demographics(BaseModel):
     """
     Response model for demographic categorization
     """
-    age: int = Field(..., description="Beneficiary age")
-    sex: Literal['M', 'F', '1', '2'] = Field(..., description="Beneficiary sex")
-    dual_elgbl_cd: Literal[None, 'NA', '99', '00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10'] = Field('NA', description="Dual status code")
-    orec: Literal[None, '0', '1', '2', '3'] = Field('0', description="Original reason for entitlement")
-    crec: Literal[None, '0', '1', '2', '3'] = Field('0', description="Current reason for entitlement")
-    new_enrollee: bool = Field(False, description="True if beneficiary is a new enrollee")
-    snp: bool = Field(False, description="True if beneficiary is in SNP")
-    version: str = Field("V2", description="Version of categorization used (V2, V4, V6)")
-    low_income: bool = Field(False, description="True if beneficiary is in low income; RxHCC only")
+    age: Union[int, float] = Field(..., description="[required] Beneficiary age")
+    sex: Literal['M', 'F', '1', '2'] = Field(..., description="[required] Beneficiary sex")
+    dual_elgbl_cd: Optional[Literal[None, 'NA', '99', '00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10']] = Field('NA', description="Dual status code")
+    orec: Optional[Literal[None, '0', '1', '2', '3']] = Field('0', description="Original reason for entitlement")
+    crec: Optional[Literal[None, '0', '1', '2', '3']] = Field('0', description="Current reason for entitlement")
+    new_enrollee: Optional[bool] = Field(False, description="True if beneficiary is a new enrollee")
+    snp: Optional[bool] = Field(False, description="True if beneficiary is in SNP")
+    version: Optional[str] = Field("V2", description="Version of categorization used (V2, V4, V6)")
+    low_income: Optional[bool] = Field(False, description="True if beneficiary is in low income; RxHCC only")
     graft_months: Optional[int] = Field(None, description="Number of months since transplant; ESRD Model only")
-    category: str = Field(..., description="[derived] Age-sex category code")
-    non_aged: bool = Field(False, description="[derived] True if age <= 64")
-    orig_disabled: bool = Field(False, description="[derived] True if originally disabled (OREC='1' and not currently disabled)")
-    disabled: bool = Field(False, description="[derived] True if currently disabled (age < 65 and OREC != '0')")
-    esrd: bool = Field(False, description="[derived] True if ESRD (ESRD Model)")
-    lti: bool = Field(False, description="[derived] True if LTI (LTI Model)") 
-    fbd: bool = Field(False, description="[derived] True if FBD (FBD Model)") 
-    pbd: bool = Field(False, description="[derived] True if PBD (PBD Model)")
+    category: Optional[str] = Field(None, description="[derived] Age-sex category code")
+    non_aged: Optional[bool] = Field(False, description="[derived] True if age <= 64")
+    orig_disabled: Optional[bool] = Field(False, description="[derived] True if originally disabled (OREC='1' and not currently disabled)")
+    disabled: Optional[bool] = Field(False, description="[derived] True if currently disabled (age < 65 and OREC != '0')")
+    esrd: Optional[bool] = Field(False, description="[derived] True if ESRD (ESRD Model)")
+    lti: Optional[bool] = Field(False, description="[derived] True if LTI (LTI Model)") 
+    fbd: Optional[bool] = Field(False, description="[derived] True if FBD (FBD Model)") 
+    pbd: Optional[bool] = Field(False, description="[derived] True if PBD (PBD Model)")
 
 
 class RAFResult(TypedDict):

{hccinfhir-0.0.5 → hccinfhir-0.0.7}/hccinfhir/hccinfhir.py

@@ -96,10 +96,7 @@ class HCCInFHIR:
         
         if not isinstance(service_data, list):
             raise ValueError("Service data must be a list of service records")
-        
-        if not service_data:
-            raise ValueError("Service data list cannot be empty")
-        
+                
         # Standardize service data with better error handling
         standardized_data = []
         for idx, item in enumerate(service_data):

{hccinfhir-0.0.5 → hccinfhir-0.0.7}/pyproject.toml

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