healthdatalayer 1.2.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

healthdatalayer/repositories/client_repositories/px_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 
-from models import Px
-from config.db import engines, get_session
+from healthdatalayer.models import Px
+from healthdatalayer.config.db import engines, get_session
 
 class PxRepository:
     def __init__(self, tenant: str):
@@ -24,32 +24,32 @@ class PxRepository:
             
             if px and load_relations:
                 if px.gender_id:
-                    from models.client.gender import Gender
+                    from healthdatalayer.models.client.gender import Gender
                     gender_obj = session.get(Gender, px.gender_id)
                     object.__setattr__(px, 'gender', gender_obj)
                 
                 if px.address_id:
-                    from models.client.address import Address
+                    from healthdatalayer.models.client.address import Address
                     address_obj = session.get(Address, px.address_id)
                     object.__setattr__(px, 'address', address_obj)
                 
                 if px.marriage_status_id:
-                    from models.client.marriage_status import MarriageStatus
+                    from healthdatalayer.models.client.marriage_status import MarriageStatus
                     marriage_status_obj = session.get(MarriageStatus, px.marriage_status_id)
                     object.__setattr__(px, 'marriage_status', marriage_status_obj)
                 
                 if px.profession_id:
-                    from models.client.profession import Profession
+                    from healthdatalayer.models.client.profession import Profession
                     profession_obj = session.get(Profession, px.profession_id)
                     object.__setattr__(px, 'profession', profession_obj)
                 
                 if px.education_id:
-                    from models.client.education import Education
+                    from healthdatalayer.models.client.education import Education
                     education_obj = session.get(Education, px.education_id)
                     object.__setattr__(px, 'education', education_obj)
                 
                 if px.user_id:
-                    from models.user.user import User
+                    from healthdatalayer.models.user.user import User
                     user_obj = session.get(User, px.user_id)
                     object.__setattr__(px, 'user', user_obj)
             
@@ -62,32 +62,32 @@ class PxRepository:
             
             if px and load_relations:
                 if px.gender_id:
-                    from models.client.gender import Gender
+                    from healthdatalayer.models.client.gender import Gender
                     gender_obj = session.get(Gender, px.gender_id)
                     object.__setattr__(px, 'gender', gender_obj)
                 
                 if px.address_id:
-                    from models.client.address import Address
+                    from healthdatalayer.models.client.address import Address
                     address_obj = session.get(Address, px.address_id)
                     object.__setattr__(px, 'address', address_obj)
                 
                 if px.marriage_status_id:
-                    from models.client.marriage_status import MarriageStatus
+                    from healthdatalayer.models.client.marriage_status import MarriageStatus
                     marriage_status_obj = session.get(MarriageStatus, px.marriage_status_id)
                     object.__setattr__(px, 'marriage_status', marriage_status_obj)
                 
                 if px.profession_id:
-                    from models.client.profession import Profession
+                    from healthdatalayer.models.client.profession import Profession
                     profession_obj = session.get(Profession, px.profession_id)
                     object.__setattr__(px, 'profession', profession_obj)
                 
                 if px.education_id:
-                    from models.client.education import Education
+                    from healthdatalayer.models.client.education import Education
                     education_obj = session.get(Education, px.education_id)
                     object.__setattr__(px, 'education', education_obj)
                 
                 if px.user_id:
-                    from models.user.user import User
+                    from healthdatalayer.models.user.user import User
                     user_obj = session.get(User, px.user_id)
                     object.__setattr__(px, 'user', user_obj)
             
@@ -97,7 +97,8 @@ class PxRepository:
         with get_session(self.tenant) as session:
             statement = select(Px).where(
                 (Px.first_name.ilike(f"%{name}%")) | 
-                (Px.last_name.ilike(f"%{name}%"))
+                (Px.last_name.ilike(f"%{name}%")) |
+                (Px.identification.ilike(f"%{name}%"))
             )
             
             results = session.exec(statement).all()
@@ -105,32 +106,32 @@ class PxRepository:
             if load_relations:
                 for px in results:
                     if px.gender_id:
-                        from models.client.gender import Gender
+                        from healthdatalayer.models.client.gender import Gender
                         gender_obj = session.get(Gender, px.gender_id)
                         object.__setattr__(px, 'gender', gender_obj)
                     
                     if px.address_id:
-                        from models.client.address import Address
+                        from healthdatalayer.models.client.address import Address
                         address_obj = session.get(Address, px.address_id)
                         object.__setattr__(px, 'address', address_obj)
                     
                     if px.marriage_status_id:
-                        from models.client.marriage_status import MarriageStatus
+                        from healthdatalayer.models.client.marriage_status import MarriageStatus
                         marriage_status_obj = session.get(MarriageStatus, px.marriage_status_id)
                         object.__setattr__(px, 'marriage_status', marriage_status_obj)
                     
                     if px.profession_id:
-                        from models.client.profession import Profession
+                        from healthdatalayer.models.client.profession import Profession
                         profession_obj = session.get(Profession, px.profession_id)
                         object.__setattr__(px, 'profession', profession_obj)
                     
                     if px.education_id:
-                        from models.client.education import Education
+                        from healthdatalayer.models.client.education import Education
                         education_obj = session.get(Education, px.education_id)
                         object.__setattr__(px, 'education', education_obj)
                     
                     if px.user_id:
-                        from models.user.user import User
+                        from healthdatalayer.models.user.user import User
                         user_obj = session.get(User, px.user_id)
                         object.__setattr__(px, 'user', user_obj)
             
@@ -148,32 +149,32 @@ class PxRepository:
             if load_relations:
                 for px in results:
                     if px.gender_id:
-                        from models.client.gender import Gender
+                        from healthdatalayer.models.client.gender import Gender
                         gender_obj = session.get(Gender, px.gender_id)
                         object.__setattr__(px, 'gender', gender_obj)
                     
                     if px.address_id:
-                        from models.client.address import Address
+                        from healthdatalayer.models.client.address import Address
                         address_obj = session.get(Address, px.address_id)
                         object.__setattr__(px, 'address', address_obj)
                     
                     if px.marriage_status_id:
-                        from models.client.marriage_status import MarriageStatus
+                        from healthdatalayer.models.client.marriage_status import MarriageStatus
                         marriage_status_obj = session.get(MarriageStatus, px.marriage_status_id)
                         object.__setattr__(px, 'marriage_status', marriage_status_obj)
                     
                     if px.profession_id:
-                        from models.client.profession import Profession
+                        from healthdatalayer.models.client.profession import Profession
                         profession_obj = session.get(Profession, px.profession_id)
                         object.__setattr__(px, 'profession', profession_obj)
                     
                     if px.education_id:
-                        from models.client.education import Education
+                        from healthdatalayer.models.client.education import Education
                         education_obj = session.get(Education, px.education_id)
                         object.__setattr__(px, 'education', education_obj)
                     
                     if px.user_id:
-                        from models.user.user import User
+                        from healthdatalayer.models.user.user import User
                         user_obj = session.get(User, px.user_id)
                         object.__setattr__(px, 'user', user_obj)
             

healthdatalayer/repositories/collaborator_repositories/collaborator_repository.py

@@ -2,9 +2,9 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select, or_
 from sqlalchemy.orm import selectinload,joinedload
-from models import Collaborator
-from models import Speciality
-from config.db import engines, get_session
+from healthdatalayer.models import Collaborator
+from healthdatalayer.models import Speciality
+from healthdatalayer.config.db import engines, get_session
 
 class CollaboratorRepository:
     def __init__(self, tenant: str):
@@ -29,12 +29,12 @@ class CollaboratorRepository:
                 if load_relations:
                     
                     if collaborator.collaborator_type_id:
-                        from models.collaborator.collaborator_type import CollaboratorType
+                        from healthdatalayer.models.collaborator.collaborator_type import CollaboratorType
                         collab_type_obj = session.get(CollaboratorType, collaborator.collaborator_type_id)
                         object.__setattr__(collaborator,'collaborator_type', collab_type_obj)
                         
                     if collaborator.user_id:
-                        from models.user.user import User
+                        from healthdatalayer.models.user.user import User
                         user_obj = session.get(User, collaborator.user_id)
                         object.__setattr__(collaborator,'user',user_obj)
                         
@@ -89,12 +89,12 @@ class CollaboratorRepository:
                 
                 for collaborator in collaborators:
                     if collaborator.collaborator_type_id:
-                        from models.collaborator.collaborator_type import CollaboratorType
+                        from healthdatalayer.models.collaborator.collaborator_type import CollaboratorType
                         collab_type_obj = session.get(CollaboratorType, collaborator.collaborator_type_id)
                         object.__setattr__(collaborator,'collaborator_type', collab_type_obj)
                         
                     if collaborator.user_id:
-                        from models.user.user import User
+                        from healthdatalayer.models.user.user import User
                         user_obj = session.get(User, collaborator.user_id)
                         object.__setattr__(collaborator,'user',user_obj)
                 return collaborators

healthdatalayer/repositories/collaborator_repositories/collaborator_type_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 
-from models import CollaboratorType
-from config.db import engines, get_session
+from healthdatalayer.models import CollaboratorType
+from healthdatalayer.config.db import engines, get_session
 
 class CollaboratorTypeRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/collaborator_repositories/speciality_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 
-from models import Speciality
-from config.db import engines, get_session
+from healthdatalayer.models import Speciality
+from healthdatalayer.config.db import engines, get_session
 
 class SpecialityRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/infraestructure_repositories/area_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 
-from models import Area
-from config.db import engines, get_session
+from healthdatalayer.models import Area
+from healthdatalayer.config.db import engines, get_session
 
 class AreaRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/infraestructure_repositories/branch_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 
-from models import Branch
-from config.db import engines, get_session
+from healthdatalayer.models import Branch
+from healthdatalayer.config.db import engines, get_session
 
 class BranchRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/infraestructure_repositories/bridge_repository.py

@@ -3,9 +3,9 @@ from uuid import UUID
 from sqlmodel import select
 from sqlalchemy.orm import selectinload,joinedload
 
-from models import BridgeAreaFloorBranch
-from models import Branch
-from config.db import engines, get_session
+from healthdatalayer.models import BridgeAreaFloorBranch
+from healthdatalayer.models import Branch
+from healthdatalayer.config.db import engines, get_session
 
 class BridgeAreaFloorBranchRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/infraestructure_repositories/floor_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 
-from models import Floor
-from config.db import engines, get_session
+from healthdatalayer.models import Floor
+from healthdatalayer.config.db import engines, get_session
 
 class FloorRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/infraestructure_repositories/room_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 
-from models import Room
-from config.db import engines, get_session
+from healthdatalayer.models import Room
+from healthdatalayer.config.db import engines, get_session
 
 class RoomRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/infraestructure_repositories/system_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 
-from models import System
-from config.db import engines, get_session
+from healthdatalayer.models import System
+from healthdatalayer.config.db import engines, get_session
 
 class SystemRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/lab_repositories/measure_lab_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 
-from models import MeasureLab
-from config.db import engines, get_session
+from healthdatalayer.models import MeasureLab
+from healthdatalayer.config.db import engines, get_session
 
 class MeasureLabRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/lab_repositories/medical_lab_repository.py

@@ -2,9 +2,9 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 
-from models import MedicalLab
-from models import Px
-from config.db import engines, get_session
+from healthdatalayer.models import MedicalLab
+from healthdatalayer.models import Px
+from healthdatalayer.config.db import engines, get_session
 
 class MedicalLabRepository:
     def __init__(self, tenant: str):
@@ -25,11 +25,11 @@ class MedicalLabRepository:
             
             if medical_lab and load_relations:
                 if medical_lab.measure_lab_id:
-                    from models import MeasureLab
+                    from healthdatalayer.models import MeasureLab
                     measure_lab_obj = session.get(MeasureLab, medical_lab.measure_lab_id)
                     object.__setattr__(medical_lab, 'measure_lab', measure_lab_obj)
                 
-                from models.lab.client_lab import ClientLab
+                from healthdatalayer.models.lab.client_lab import ClientLab
                 statement = select(ClientLab).where(ClientLab.medical_lab_id == medical_lab_id)
                 client_labs = session.exec(statement).all()
                 
@@ -50,11 +50,11 @@ class MedicalLabRepository:
             
             if medical_lab and load_relations:
                 if medical_lab.measure_lab_id:
-                    from models import MeasureLab
+                    from healthdatalayer.models import MeasureLab
                     measure_lab_obj = session.get(MeasureLab, medical_lab.measure_lab_id)
                     object.__setattr__(medical_lab, 'measure_lab', measure_lab_obj)
                 
-                from models.lab.client_lab import ClientLab
+                from healthdatalayer.models.lab.client_lab import ClientLab
                 statement_cl = select(ClientLab).where(ClientLab.medical_lab_id == medical_lab.medical_lab_id)
                 client_labs = session.exec(statement_cl).all()
                 
@@ -74,8 +74,8 @@ class MedicalLabRepository:
             results = session.exec(statement).all()
             
             if load_relations:
-                from models import MeasureLab
-                from models.lab.client_lab import ClientLab
+                from healthdatalayer.models import MeasureLab
+                from healthdatalayer.models.lab.client_lab import ClientLab
                 
                 for medical_lab in results:
                     if medical_lab.measure_lab_id:
@@ -105,8 +105,8 @@ class MedicalLabRepository:
             results = session.exec(statement).all()
             
             if load_relations:
-                from models import MeasureLab
-                from models.lab.client_lab import ClientLab
+                from healthdatalayer.models import MeasureLab
+                from healthdatalayer.models.lab.client_lab import ClientLab
                 
                 for medical_lab in results:
                     if medical_lab.measure_lab_id:
@@ -175,7 +175,7 @@ class MedicalLabRepository:
     def get_medical_lab_patients_command(self, medical_lab_id: UUID) -> List[Px]:
         """Get all patients associated with a medical lab"""
         with get_session(self.tenant) as session:
-            from models.lab.client_lab import ClientLab
+            from healthdatalayer.models.lab.client_lab import ClientLab
             
             statement = select(ClientLab).where(ClientLab.medical_lab_id == medical_lab_id)
             client_labs = session.exec(statement).all()
@@ -191,7 +191,7 @@ class MedicalLabRepository:
     def assign_patient_command(self, medical_lab_id: UUID, px_id: UUID) -> Optional[MedicalLab]:
         """Assign a patient to a medical lab"""
         with get_session(self.tenant) as session:
-            from models.lab.client_lab import ClientLab
+            from healthdatalayer.models.lab.client_lab import ClientLab
             
             medical_lab = session.get(MedicalLab, medical_lab_id)
             if not medical_lab:
@@ -219,7 +219,7 @@ class MedicalLabRepository:
     def remove_patient_command(self, medical_lab_id: UUID, px_id: UUID) -> Optional[MedicalLab]:
         """Remove a patient from a medical lab"""
         with get_session(self.tenant) as session:
-            from models.lab.client_lab import ClientLab
+            from healthdatalayer.models.lab.client_lab import ClientLab
             
             medical_lab = session.get(MedicalLab, medical_lab_id)
             if not medical_lab:
@@ -242,7 +242,7 @@ class MedicalLabRepository:
     def is_patient_assigned_command(self, medical_lab_id: UUID, px_id: UUID) -> bool:
         """Check if a patient is assigned to a medical lab"""
         with get_session(self.tenant) as session:
-            from models.lab.client_lab import ClientLab
+            from healthdatalayer.models.lab.client_lab import ClientLab
             
             result = session.exec(
                 select(ClientLab).where(

healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 
-from models import MedicalDiagnosis
-from config.db import engines, get_session
+from healthdatalayer.models import MedicalDiagnosis
+from healthdatalayer.config.db import engines, get_session
 
 class MedicalDiagnosisRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/medical_visit_repositories/medical_diagnosis_visit_repository.py

@@ -2,9 +2,9 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select, or_
 from sqlalchemy.orm import selectinload,joinedload
-from models import MedicalDiagnosisVisit
-from models import MedicalVisit
-from config.db import engines, get_session
+from healthdatalayer.models import MedicalDiagnosisVisit
+from healthdatalayer.models import MedicalVisit
+from healthdatalayer.config.db import engines, get_session
 
 class MedicalDiagnosisVisitRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/medical_visit_repositories/medical_drug_recipe_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 from sqlalchemy.orm import selectinload,joinedload
-from models import MedicalDrugRecipe
-from config.db import engines, get_session
+from healthdatalayer.models import MedicalDrugRecipe
+from healthdatalayer.config.db import engines, get_session
 
 class MedicalDrugRecipeRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/medical_visit_repositories/medical_drug_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select
 
-from models import MedicalDrug
-from config.db import engines, get_session
+from healthdatalayer.models import MedicalDrug
+from healthdatalayer.config.db import engines, get_session
 
 class MedicalDrugRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/medical_visit_repositories/medical_recipe_visit_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select, or_
 from sqlalchemy.orm import selectinload,joinedload
-from models import MedicalRecipeVisit
-from config.db import engines, get_session
+from healthdatalayer.models import MedicalRecipeVisit
+from healthdatalayer.config.db import engines, get_session
 
 class MedicalRecipeVisitRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/medical_visit_repositories/medical_visit_repository.py

@@ -2,8 +2,8 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select, or_
 from sqlalchemy.orm import selectinload,joinedload
-from models import MedicalVisit
-from config.db import engines, get_session
+from healthdatalayer.models import MedicalVisit
+from healthdatalayer.config.db import engines, get_session
 
 class MedicalVisitRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/medical_visit_repositories/organ_system_review_repository.py

@@ -2,9 +2,9 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select, or_
 from sqlalchemy.orm import selectinload,joinedload
-from models import OrganSystemReview
-from models import MedicalVisit
-from config.db import engines, get_session
+from healthdatalayer.models import OrganSystemReview
+from healthdatalayer.models import MedicalVisit
+from healthdatalayer.config.db import engines, get_session
 
 class OrganSystemReviewRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/medical_visit_repositories/physical_exam_repository.py

@@ -2,9 +2,9 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select, or_
 from sqlalchemy.orm import selectinload,joinedload
-from models import PhysicalExam
-from models import MedicalVisit
-from config.db import engines, get_session
+from healthdatalayer.models import PhysicalExam
+from healthdatalayer.models import MedicalVisit
+from healthdatalayer.config.db import engines, get_session
 
 class PhysicalExamRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/medical_visit_repositories/visit_triage_repository.py

@@ -2,9 +2,9 @@ from typing import Optional, List
 from uuid import UUID
 from sqlmodel import select, or_
 from sqlalchemy.orm import selectinload,joinedload
-from models import VisitTriage
-from models import MedicalVisit
-from config.db import engines, get_session
+from healthdatalayer.models import VisitTriage
+from healthdatalayer.models import MedicalVisit
+from healthdatalayer.config.db import engines, get_session
 
 class VisitTriageRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/user_repositories/permission_repository.py

@@ -3,10 +3,10 @@ from uuid import UUID
 from sqlmodel import select
 from sqlalchemy.orm import selectinload
 
-from models import Permission
-from models import Role
-from models import User
-from config.db import engines, get_session
+from healthdatalayer.models import Permission
+from healthdatalayer.models import Role
+from healthdatalayer.models import User
+from healthdatalayer.config.db import engines, get_session
 
 class PermissionRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/user_repositories/role_repository.py

@@ -3,10 +3,10 @@ from uuid import UUID
 from sqlmodel import select
 from sqlalchemy.orm import selectinload
 
-from models import Role
-from models import Permission
-from models import User
-from config.db import engines, get_session
+from healthdatalayer.models import Role
+from healthdatalayer.models import Permission
+from healthdatalayer.models import User
+from healthdatalayer.config.db import engines, get_session
 
 class RoleRepository:
     def __init__(self, tenant: str):

healthdatalayer/repositories/user_repositories/user_repository.py

@@ -3,10 +3,10 @@ from uuid import UUID
 from sqlmodel import select
 from sqlalchemy.orm import selectinload
 
-from models import User
-from models import Role
-from models import Permission
-from config.db import engines, get_session
+from healthdatalayer.models import User
+from healthdatalayer.models import Role
+from healthdatalayer.models import Permission
+from healthdatalayer.config.db import engines, get_session
 
 class UserRepository:
     def __init__(self, tenant: str):

{healthdatalayer-1.2.0.dist-info → healthdatalayer-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: healthdatalayer
-Version: 1.2.0
+Version: 1.4.0
 Summary: Health Datalayer to access data from different sources
 Author: Jesus Martinez
 Author-email: jesusmartinez@noosds.com