Feed tables data into databse table

Dockerfile

@@ -29,6 +29,7 @@ COPY --chown=user main.py /app/
 COPY --chown=user src /app/src
 COPY --chown=user alembic.ini /app/
 COPY --chown=user seed_vector_data.py /app/
+COPY --chown=user feed_data.py /app/
 
 EXPOSE 7860
 

alembic/versions/273997959ba7_add_6_models_in_database.py

@@ -1,32 +0,0 @@
-"""Add 6 models in database
-
-Revision ID: 273997959ba7
-Revises: 
-Create Date: 2026-03-13 11:51:55.126289
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-
-
-# revision identifiers, used by Alembic.
-revision: str = '273997959ba7'
-down_revision: Union[str, Sequence[str], None] = None
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    pass
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    pass
-    # ### end Alembic commands ###

alembic/versions/5d05c77fab33_generate_6_tables.py

@@ -0,0 +1,550 @@
+"""generate 6 tables
+
+Revision ID: 5d05c77fab33
+Revises: 
+Create Date: 2026-03-13 15:26:40.120103
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '5d05c77fab33'
+down_revision: Union[str, Sequence[str], None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('auv_incidentbase',
+    sa.Column('incidentkey', sa.String(length=14), nullable=False),
+    sa.Column('IncidentNumber', sa.String(length=20), nullable=True),
+    sa.Column('IncidentExposureNumber', sa.String(length=5), nullable=True),
+    sa.Column('CompletedReportCode', sa.String(length=2), nullable=True),
+    sa.Column('CompletedReportDescrip', sa.String(length=50), nullable=True),
+    sa.Column('ReviewedReportCode', sa.String(length=2), nullable=True),
+    sa.Column('ReviewReportDescrip', sa.String(length=50), nullable=True),
+    sa.Column('PublicReleaseReportCode', sa.String(length=2), nullable=True),
+    sa.Column('PublicReleaseReportDescrip', sa.String(length=50), nullable=True),
+    sa.Column('DidNotArriveCode', sa.String(length=2), nullable=True),
+    sa.Column('DidNotArriveDescrip', sa.String(length=50), nullable=True),
+    sa.Column('AlarmDateTime', sa.DateTime(), nullable=True),
+    sa.Column('Alarmtime', sa.String(length=10), nullable=True),
+    sa.Column('Alarmdate', sa.String(length=10), nullable=True),
+    sa.Column('ArrivalDateTime', sa.DateTime(), nullable=True),
+    sa.Column('Arrivaltime', sa.String(length=10), nullable=True),
+    sa.Column('Arrivaldate', sa.String(length=10), nullable=True),
+    sa.Column('ControlledDateTime', sa.DateTime(), nullable=True),
+    sa.Column('Controlledtime', sa.String(length=10), nullable=True),
+    sa.Column('Controlleddate', sa.String(length=10), nullable=True),
+    sa.Column('ClearedDateTime', sa.DateTime(), nullable=True),
+    sa.Column('Clearedtime', sa.String(length=10), nullable=True),
+    sa.Column('Cleareddate', sa.String(length=10), nullable=True),
+    sa.Column('ResponseTime', sa.String(length=20), nullable=True),
+    sa.Column('ResponseTimediffseconds', sa.Integer(), nullable=True),
+    sa.Column('IncidentTotalTime1', sa.String(length=20), nullable=True),
+    sa.Column('IncidentTotalTimediffseconds', sa.Integer(), nullable=True),
+    sa.Column('District', sa.String(length=20), nullable=True),
+    sa.Column('Station', sa.String(length=20), nullable=True),
+    sa.Column('Shift', sa.String(length=10), nullable=True),
+    sa.Column('Alarms', sa.Integer(), nullable=True),
+    sa.Column('IncidentTypeCode', sa.String(length=10), nullable=True),
+    sa.Column('IncidentTypeDescrip', sa.String(length=255), nullable=True),
+    sa.Column('InitialDispatchCode', sa.String(length=10), nullable=True),
+    sa.Column('finaldispatchcode', sa.String(length=10), nullable=True),
+    sa.Column('MutualAidFlagCode', sa.String(length=2), nullable=True),
+    sa.Column('MutualAidTypeCode', sa.String(length=10), nullable=True),
+    sa.Column('MutualAidTypeDescrip', sa.String(length=255), nullable=True),
+    sa.Column('MutalAidIncidentNo', sa.String(length=50), nullable=True),
+    sa.Column('actiontaken1code', sa.String(length=10), nullable=True),
+    sa.Column('actiontaken1descip', sa.String(length=255), nullable=True),
+    sa.Column('actiontaken2code', sa.String(length=10), nullable=True),
+    sa.Column('actiontaken2descip', sa.String(length=255), nullable=True),
+    sa.Column('actiontaken3code', sa.String(length=10), nullable=True),
+    sa.Column('actiontaken3descip', sa.String(length=255), nullable=True),
+    sa.Column('ApparatusSuppressionCount', sa.Integer(), nullable=True),
+    sa.Column('ApparatusEMSCount', sa.Integer(), nullable=True),
+    sa.Column('ApparatusOtherCount', sa.Integer(), nullable=True),
+    sa.Column('ApparatusTotalCount', sa.Integer(), nullable=True),
+    sa.Column('PersonnelSuppressionCount', sa.Integer(), nullable=True),
+    sa.Column('PersonnelEMSCount', sa.Integer(), nullable=True),
+    sa.Column('PersonnelOtherCount', sa.Integer(), nullable=True),
+    sa.Column('PersonnelTotalCount', sa.Integer(), nullable=True),
+    sa.Column('MAidApparatusSuppressionCount', sa.Integer(), nullable=True),
+    sa.Column('MAidApparatusEMSCount', sa.Integer(), nullable=True),
+    sa.Column('MAidApparatusOtherCount', sa.Integer(), nullable=True),
+    sa.Column('MAidApparatusTotalCount', sa.Integer(), nullable=True),
+    sa.Column('MAidPersonnelSuppressionCount', sa.Integer(), nullable=True),
+    sa.Column('MaidPersonnelEMSCount', sa.Integer(), nullable=True),
+    sa.Column('MAidPersonnelOtherCount', sa.Integer(), nullable=True),
+    sa.Column('MaidPersonnelTotalCount', sa.Integer(), nullable=True),
+    sa.Column('LossProperty', sa.Float(), nullable=True),
+    sa.Column('LossContents', sa.Float(), nullable=True),
+    sa.Column('ValueProperty', sa.Float(), nullable=True),
+    sa.Column('ValueContents', sa.Float(), nullable=True),
+    sa.Column('LossTotal', sa.Float(), nullable=True),
+    sa.Column('ValueTotal', sa.Float(), nullable=True),
+    sa.Column('ValueSaved', sa.Float(), nullable=True),
+    sa.Column('DetectorAlertedCode', sa.String(length=10), nullable=True),
+    sa.Column('DetectorAlertedDescrip', sa.String(length=255), nullable=True),
+    sa.Column('HazardMaterialReleasedCode', sa.String(length=10), nullable=True),
+    sa.Column('HazardMaterialReleasedDescrip', sa.String(length=255), nullable=True),
+    sa.Column('PropertyUseCode', sa.String(length=10), nullable=True),
+    sa.Column('PropertyUseDescrip', sa.String(length=255), nullable=True),
+    sa.Column('MixedUseCode', sa.String(length=10), nullable=True),
+    sa.Column('MixedUseDescrip', sa.String(length=255), nullable=True),
+    sa.Column('StreetNumber', sa.String(length=50), nullable=True),
+    sa.Column('StreetPrefix', sa.String(length=20), nullable=True),
+    sa.Column('StreetName', sa.String(length=255), nullable=True),
+    sa.Column('StreetType', sa.String(length=20), nullable=True),
+    sa.Column('StreetSuffix', sa.String(length=20), nullable=True),
+    sa.Column('Apartment', sa.String(length=20), nullable=True),
+    sa.Column('City', sa.String(length=100), nullable=True),
+    sa.Column('State', sa.String(length=20), nullable=True),
+    sa.Column('ZipCode', sa.String(length=20), nullable=True),
+    sa.Column('AddressComposite', sa.Text(), nullable=True),
+    sa.Column('CityStateZipComposite', sa.Text(), nullable=True),
+    sa.Column('CensusTract', sa.String(length=20), nullable=True),
+    sa.Column('EmsProvidedCode', sa.String(length=2), nullable=True),
+    sa.Column('EMSProvidedDescrip', sa.String(length=50), nullable=True),
+    sa.Column('LocationTypeCode', sa.String(length=5), nullable=True),
+    sa.Column('LocationTypeDescrip', sa.String(length=100), nullable=True),
+    sa.Column('fatalfireservicecode', sa.String(length=2), nullable=True),
+    sa.Column('fatalfireservicedescrip', sa.String(length=100), nullable=True),
+    sa.Column('fatalciviliancode', sa.String(length=2), nullable=True),
+    sa.Column('fatalciviliandescrip', sa.String(length=100), nullable=True),
+    sa.Column('injuredfireservicecode', sa.String(length=2), nullable=True),
+    sa.Column('injuredfireservicedescrip', sa.String(length=100), nullable=True),
+    sa.Column('injuredciviliancode', sa.String(length=2), nullable=True),
+    sa.Column('injuredciviliandescrip', sa.String(length=100), nullable=True),
+    sa.Column('casualtiescode', sa.String(length=2), nullable=True),
+    sa.Column('casualtiesdescrip', sa.String(length=100), nullable=True),
+    sa.Column('priorityrespcode', sa.String(length=2), nullable=True),
+    sa.Column('priorityrespdescrip', sa.String(length=100), nullable=True),
+    sa.Column('crossstreetprefix', sa.String(length=20), nullable=True),
+    sa.Column('crossstreetname', sa.String(length=255), nullable=True),
+    sa.Column('crossstreettype', sa.String(length=20), nullable=True),
+    sa.Column('crossstreetsuffix', sa.String(length=20), nullable=True),
+    sa.Column('CrossStreetComposite', sa.Text(), nullable=True),
+    sa.Column('directions', sa.Text(), nullable=True),
+    sa.Column('county', sa.String(length=100), nullable=True),
+    sa.Column('mappage', sa.String(length=50), nullable=True),
+    sa.Column('hwycalloutrequestby', sa.String(length=50), nullable=True),
+    sa.Column('hwyinvestpolicecode', sa.String(length=10), nullable=True),
+    sa.Column('hwyinvetpolicedescrip', sa.String(length=255), nullable=True),
+    sa.Column('hwyofficer', sa.String(length=100), nullable=True),
+    sa.Column('hwybadgenumber', sa.String(length=20), nullable=True),
+    sa.Column('hwyreportnumber', sa.String(length=50), nullable=True),
+    sa.Column('hwycauseemergcode', sa.String(length=10), nullable=True),
+    sa.Column('hwycauseemergdescrip', sa.String(length=255), nullable=True),
+    sa.Column('hwycauseotherdescrip', sa.Text(), nullable=True),
+    sa.Column('hwyloecode', sa.String(length=10), nullable=True),
+    sa.Column('hwyloedescrip', sa.String(length=255), nullable=True),
+    sa.Column('hwyloeotherdescrip', sa.Text(), nullable=True),
+    sa.Column('hwyobstrcutioncode', sa.String(length=10), nullable=True),
+    sa.Column('hwyobstructiondescrip', sa.String(length=255), nullable=True),
+    sa.Column('hwyobstructionotherdescrip', sa.Text(), nullable=True),
+    sa.Column('hwynoservicecode', sa.String(length=2), nullable=True),
+    sa.Column('hwynoservicedescrip', sa.String(length=100), nullable=True),
+    sa.Column('hwyextinguishcode', sa.String(length=2), nullable=True),
+    sa.Column('hwyextinguishdescrip', sa.String(length=100), nullable=True),
+    sa.Column('hwycleanupcode', sa.String(length=2), nullable=True),
+    sa.Column('hwycleanupdescrip', sa.String(length=100), nullable=True),
+    sa.Column('hwyextractioncode', sa.String(length=2), nullable=True),
+    sa.Column('hwyextractiodescrip', sa.String(length=100), nullable=True),
+    sa.Column('hwyfirstaidcode', sa.String(length=2), nullable=True),
+    sa.Column('hwyfirstaidedescrip', sa.String(length=100), nullable=True),
+    sa.Column('hwydamagecode', sa.String(length=2), nullable=True),
+    sa.Column('hwydamagedescrip', sa.String(length=100), nullable=True),
+    sa.Column('hwyprivatedamcode', sa.String(length=2), nullable=True),
+    sa.Column('hwyprivatedescrip', sa.String(length=100), nullable=True),
+    sa.Column('hwycitycode', sa.String(length=2), nullable=True),
+    sa.Column('hwycitydescrip', sa.String(length=100), nullable=True),
+    sa.Column('hwyothercode', sa.String(length=2), nullable=True),
+    sa.Column('hwynotherdescrip', sa.String(length=100), nullable=True),
+    sa.Column('hwyothertext', sa.Text(), nullable=True),
+    sa.Column('water_used', sa.String(length=2), nullable=True),
+    sa.Column('water_used_quantity', sa.Float(), nullable=True),
+    sa.Column('foam_used', sa.String(length=2), nullable=True),
+    sa.Column('foam_used_quantity', sa.Float(), nullable=True),
+    sa.Column('oilzorb_used', sa.String(length=2), nullable=True),
+    sa.Column('oilzorb_used_quantity', sa.Float(), nullable=True),
+    sa.Column('other_used', sa.String(length=2), nullable=True),
+    sa.Column('other_used_quantity', sa.Float(), nullable=True),
+    sa.Column('codetectpresentcode', sa.String(length=2), nullable=True),
+    sa.Column('codetectpresentdescrip', sa.String(length=100), nullable=True),
+    sa.Column('cotypecode', sa.String(length=10), nullable=True),
+    sa.Column('cotypedescrip', sa.String(length=255), nullable=True),
+    sa.Column('copowersupplycode', sa.String(length=10), nullable=True),
+    sa.Column('copowersupplydescrip', sa.String(length=255), nullable=True),
+    sa.Column('cooperationcode', sa.String(length=10), nullable=True),
+    sa.Column('cooperationdescrip', sa.String(length=255), nullable=True),
+    sa.Column('coeffectivecode', sa.String(length=10), nullable=True),
+    sa.Column('coeffectivedescrip', sa.String(length=255), nullable=True),
+    sa.Column('cofailurecode', sa.String(length=10), nullable=True),
+    sa.Column('cofailuredescrip', sa.String(length=255), nullable=True),
+    sa.Column('codetectormfg', sa.String(length=100), nullable=True),
+    sa.Column('codetectormodel', sa.String(length=100), nullable=True),
+    sa.Column('cochildrencount', sa.Integer(), nullable=True),
+    sa.Column('coyouthscount', sa.Integer(), nullable=True),
+    sa.Column('coadultscount', sa.Integer(), nullable=True),
+    sa.Column('coseniorscount', sa.Integer(), nullable=True),
+    sa.Column('latitude', sa.Float(), nullable=True),
+    sa.Column('longitude', sa.Float(), nullable=True),
+    sa.Column('changedate', sa.DateTime(), nullable=True),
+    sa.Column('IncidentDateTime', sa.DateTime(), nullable=True),
+    sa.Column('Incidenttime', sa.String(length=10), nullable=True),
+    sa.Column('Incidentdate', sa.String(length=10), nullable=True),
+    sa.Column('created', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
+    sa.PrimaryKeyConstraint('incidentkey')
+    )
+    op.create_index(op.f('ix_auv_incidentbase_incidentkey'), 'auv_incidentbase', ['incidentkey'], unique=False)
+    op.create_table('auv_incidentpersonnel',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('personnelkey', sa.String(length=14), nullable=True),
+    sa.Column('namefirst', sa.String(length=25), nullable=True),
+    sa.Column('namemi', sa.String(length=2), nullable=True),
+    sa.Column('namelast', sa.String(length=25), nullable=True),
+    sa.Column('namesuffix', sa.String(length=5), nullable=True),
+    sa.Column('rank', sa.String(length=10), nullable=True),
+    sa.Column('actiontaken1code', sa.String(length=10), nullable=True),
+    sa.Column('actiontaken1descip', sa.String(length=255), nullable=True),
+    sa.Column('actiontaken2code', sa.String(length=10), nullable=True),
+    sa.Column('actiontaken2descip', sa.String(length=255), nullable=True),
+    sa.Column('actiontaken3code', sa.String(length=10), nullable=True),
+    sa.Column('actiontaken3descip', sa.String(length=255), nullable=True),
+    sa.Column('actiontaken4code', sa.String(length=10), nullable=True),
+    sa.Column('actiontaken4descip', sa.String(length=255), nullable=True),
+    sa.Column('amount1', sa.Float(), nullable=True),
+    sa.Column('amount2', sa.Float(), nullable=True),
+    sa.Column('crole', sa.Integer(), nullable=True),
+    sa.Column('losapcreditcode', sa.Integer(), nullable=True),
+    sa.Column('losapcreditdescrip', sa.String(length=100), nullable=True),
+    sa.Column('apparatusid', sa.String(length=10), nullable=True),
+    sa.Column('numberofresponders', sa.Integer(), nullable=True),
+    sa.Column('responsetimeseconds', sa.Integer(), nullable=True),
+    sa.Column('dispatchcleardiffseconds', sa.Integer(), nullable=True),
+    sa.Column('created', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_table('incident',
+    sa.Column('incidentkey', sa.String(length=14), nullable=False),
+    sa.Column('incidentdate', sa.DateTime(), nullable=True),
+    sa.Column('incidentnumber', sa.String(length=10), nullable=True),
+    sa.Column('exposure', sa.String(length=3), nullable=True),
+    sa.Column('incidentstatus', sa.String(length=20), nullable=True),
+    sa.Column('reviewstatusflag', sa.Boolean(), nullable=True),
+    sa.Column('publicreleaseflag', sa.Boolean(), nullable=True),
+    sa.Column('completed', sa.Boolean(), nullable=True),
+    sa.Column('transactiontype', sa.String(length=4), nullable=True),
+    sa.Column('district', sa.String(length=10), nullable=True),
+    sa.Column('station', sa.String(length=30), nullable=True),
+    sa.Column('shift', sa.String(length=2), nullable=True),
+    sa.Column('company', sa.String(length=64), nullable=True),
+    sa.Column('incidenttype', sa.String(length=4), nullable=True),
+    sa.Column('initialdispatchcode', sa.String(length=25), nullable=True),
+    sa.Column('mutualaidcode', sa.String(length=4), nullable=True),
+    sa.Column('alarmdate', sa.DateTime(), nullable=True),
+    sa.Column('arrivaldate', sa.DateTime(), nullable=True),
+    sa.Column('didnotarriveflag', sa.Boolean(), nullable=True),
+    sa.Column('controlleddate', sa.DateTime(), nullable=True),
+    sa.Column('lastunitcleareddate', sa.DateTime(), nullable=True),
+    sa.Column('includemutualaidflag', sa.Boolean(), nullable=True),
+    sa.Column('madepartment', sa.String(length=30), nullable=True),
+    sa.Column('madeptincidentno', sa.String(length=9), nullable=True),
+    sa.Column('alarms', sa.Integer(), nullable=True),
+    sa.Column('actiontaken1', sa.String(length=4), nullable=True),
+    sa.Column('actiontaken2', sa.String(length=4), nullable=True),
+    sa.Column('actiontaken3', sa.String(length=4), nullable=True),
+    sa.Column('resourceformusedflag', sa.Boolean(), nullable=True),
+    sa.Column('apparatussuppression', sa.Integer(), nullable=True),
+    sa.Column('apparatusems', sa.Integer(), nullable=True),
+    sa.Column('apparatusother', sa.Integer(), nullable=True),
+    sa.Column('personnelsuppression', sa.Integer(), nullable=True),
+    sa.Column('personnelems', sa.Integer(), nullable=True),
+    sa.Column('personnelother', sa.Integer(), nullable=True),
+    sa.Column('lossproperty', sa.Numeric(), nullable=True),
+    sa.Column('losscontents', sa.Numeric(), nullable=True),
+    sa.Column('valueproperty', sa.Numeric(), nullable=True),
+    sa.Column('valuecontents', sa.Numeric(), nullable=True),
+    sa.Column('fatalfireservice', sa.Integer(), nullable=True),
+    sa.Column('fatalother', sa.Integer(), nullable=True),
+    sa.Column('nonfatalfireservice', sa.Integer(), nullable=True),
+    sa.Column('nonfatalother', sa.Integer(), nullable=True),
+    sa.Column('detector', sa.String(length=4), nullable=True),
+    sa.Column('hazardmaterialreleased', sa.String(length=4), nullable=True),
+    sa.Column('mixeduse', sa.String(length=4), nullable=True),
+    sa.Column('propertyuse', sa.String(length=4), nullable=True),
+    sa.Column('emsprovidedflag', sa.Boolean(), nullable=True),
+    sa.Column('casualtiesflag', sa.Integer(), nullable=True),
+    sa.Column('priorityresponseflag', sa.Boolean(), nullable=True),
+    sa.Column('vendorid', sa.String(length=20), nullable=True),
+    sa.Column('locationtype', sa.Float(), nullable=True),
+    sa.Column('censustract', sa.String(length=7), nullable=True),
+    sa.Column('numberormile', sa.String(length=8), nullable=True),
+    sa.Column('streetprefix', sa.String(length=2), nullable=True),
+    sa.Column('streethighway', sa.String(length=30), nullable=True),
+    sa.Column('streettype', sa.String(length=4), nullable=True),
+    sa.Column('streetsuffix', sa.String(length=2), nullable=True),
+    sa.Column('apartment', sa.String(length=15), nullable=True),
+    sa.Column('city', sa.String(length=20), nullable=True),
+    sa.Column('state', sa.String(length=2), nullable=True),
+    sa.Column('postalcode', sa.String(length=20), nullable=True),
+    sa.Column('directions', sa.Text(), nullable=True),
+    sa.Column('latitude', sa.String(length=20), nullable=True),
+    sa.Column('longitude', sa.String(length=20), nullable=True),
+    sa.Column('compositeaddress', sa.String(length=50), nullable=True),
+    sa.Column('county', sa.String(length=20), nullable=True),
+    sa.Column('occupancykey', sa.String(length=14), nullable=True),
+    sa.Column('occupancynumber', sa.String(length=16), nullable=True),
+    sa.Column('occupancyname', sa.String(length=40), nullable=True),
+    sa.Column('runcard', sa.String(length=8), nullable=True),
+    sa.Column('mappage', sa.String(length=20), nullable=True),
+    sa.Column('descrip', sa.String(length=30), nullable=True),
+    sa.Column('addressvalidated', sa.Integer(), nullable=True),
+    sa.Column('CADCompleted', sa.Boolean(), nullable=True),
+    sa.Column('changedate', sa.DateTime(), nullable=True),
+    sa.Column('rowguid', sa.String(length=50), nullable=True),
+    sa.Column('LogComments', sa.Text(), nullable=True),
+    sa.Column('Incident_ID', sa.Integer(), nullable=True),
+    sa.Column('loss_not_known', sa.Boolean(), nullable=True),
+    sa.Column('collecteddate', sa.DateTime(), nullable=True),
+    sa.Column('DispatchIncType', sa.String(length=80), nullable=True),
+    sa.Column('nfscasualtycnt', sa.Integer(), nullable=True),
+    sa.Column('ncivcasualtycnt', sa.Integer(), nullable=True),
+    sa.Column('psaptime', sa.DateTime(), nullable=True),
+    sa.Column('ResponseType', sa.String(length=10), nullable=True),
+    sa.Column('CADText1', sa.String(length=50), nullable=True),
+    sa.Column('CADText2', sa.String(length=50), nullable=True),
+    sa.Column('CADText3', sa.String(length=50), nullable=True),
+    sa.Column('CADCombo1', sa.String(length=50), nullable=True),
+    sa.Column('CADCombo2', sa.String(length=50), nullable=True),
+    sa.Column('CADCombo3', sa.String(length=50), nullable=True),
+    sa.Column('GMTOffSet', sa.String(length=6), nullable=True),
+    sa.Column('CADDate1', sa.DateTime(), nullable=True),
+    sa.Column('CADDate2', sa.DateTime(), nullable=True),
+    sa.Column('CADDate3', sa.DateTime(), nullable=True),
+    sa.Column('responseTime', sa.String(length=20), nullable=True),
+    sa.Column('turnTime', sa.String(length=20), nullable=True),
+    sa.Column('Mapset', sa.String(length=6), nullable=True),
+    sa.Column('Easting', sa.String(length=5), nullable=True),
+    sa.Column('Northing', sa.String(length=5), nullable=True),
+    sa.Column('created', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
+    sa.PrimaryKeyConstraint('incidentkey')
+    )
+    op.create_index(op.f('ix_incident_incidentkey'), 'incident', ['incidentkey'], unique=False)
+    op.create_table('apparatus',
+    sa.Column('apparatuskey', sa.String(length=14), nullable=False),
+    sa.Column('incidentkey', sa.String(length=14), nullable=True),
+    sa.Column('apsid', sa.String(length=14), nullable=True),
+    sa.Column('apparatusid', sa.String(length=8), nullable=True),
+    sa.Column('priorityresponseflag', sa.Boolean(), nullable=True),
+    sa.Column('arrivaldate', sa.DateTime(), nullable=True),
+    sa.Column('scenedate', sa.DateTime(), nullable=True),
+    sa.Column('enroutedate', sa.DateTime(), nullable=True),
+    sa.Column('facilitydate', sa.DateTime(), nullable=True),
+    sa.Column('cleardate', sa.DateTime(), nullable=True),
+    sa.Column('dispatchdate', sa.DateTime(), nullable=True),
+    sa.Column('inservicedate', sa.DateTime(), nullable=True),
+    sa.Column('cancelledenrouteflag', sa.Boolean(), nullable=True),
+    sa.Column('numberpeople', sa.Integer(), nullable=True),
+    sa.Column('usecode', sa.String(length=4), nullable=True),
+    sa.Column('actiontaken1', sa.String(length=4), nullable=True),
+    sa.Column('actiontaken2', sa.String(length=4), nullable=True),
+    sa.Column('actiontaken3', sa.String(length=4), nullable=True),
+    sa.Column('actiontaken4', sa.String(length=4), nullable=True),
+    sa.Column('apparatustype', sa.String(length=4), nullable=True),
+    sa.Column('amount1', sa.Numeric(precision=10, scale=2), nullable=True),
+    sa.Column('amount2', sa.Numeric(precision=10, scale=2), nullable=True),
+    sa.Column('otherinfo', sa.String(length=20), nullable=True),
+    sa.Column('logcomments', sa.Text(), nullable=True),
+    sa.Column('fdid_no', sa.String(length=20), nullable=True),
+    sa.Column('paramedicdispatch', sa.String(length=6), nullable=True),
+    sa.Column('firstarrivingunit', sa.Boolean(), nullable=True),
+    sa.Column('inservicetime', sa.DateTime(), nullable=True),
+    sa.Column('respondfromquarters', sa.Boolean(), nullable=True),
+    sa.Column('changedate', sa.DateTime(), nullable=True),
+    sa.Column('rowguid', sa.String(length=36), nullable=True),
+    sa.Column('hydrant_idnumber', sa.String(length=20), nullable=True),
+    sa.Column('hydrant_location', sa.String(length=116), nullable=True),
+    sa.Column('alarms', sa.String(length=10), nullable=True),
+    sa.Column('llosap_credit', sa.Boolean(), nullable=True),
+    sa.Column('emsrun', sa.Boolean(), nullable=True),
+    sa.Column('emsrunnumber', sa.String(length=14), nullable=True),
+    sa.Column('lprocessepcr', sa.Boolean(), nullable=True),
+    sa.Column('nepcrrun', sa.Integer(), nullable=True),
+    sa.Column('stagingdate', sa.DateTime(), nullable=True),
+    sa.Column('isepcr', sa.Boolean(), nullable=True),
+    sa.Column('unit_exc', sa.String(length=10), nullable=True),
+    sa.Column('aedtype', sa.String(length=10), nullable=True),
+    sa.Column('odometeronscene', sa.Numeric(precision=12, scale=2), nullable=True),
+    sa.Column('odometerdestination', sa.Numeric(precision=12, scale=2), nullable=True),
+    sa.Column('mileagetransport', sa.Numeric(precision=12, scale=2), nullable=True),
+    sa.Column('atpatientsidetime', sa.DateTime(), nullable=True),
+    sa.Column('aerialdeviceused', sa.Integer(), nullable=True),
+    sa.Column('gmtoffset', sa.String(length=6), nullable=True),
+    sa.Column('firsteffectiveunit', sa.Integer(), nullable=True),
+    sa.Column('lnfirsexported', sa.Boolean(), nullable=True),
+    sa.Column('nfirsexporteddate', sa.DateTime(), nullable=True),
+    sa.Column('infirssequence', sa.Integer(), nullable=True),
+    sa.Column('nfirsttransactiontype', sa.String(length=1), nullable=True),
+    sa.Column('hydrant_used', sa.Integer(), nullable=True),
+    sa.Column('defaultdispatchcode', sa.String(length=25), nullable=True),
+    sa.Column('responsetime', sa.String(length=20), nullable=True),
+    sa.Column('turntime', sa.String(length=20), nullable=True),
+    sa.Column('created', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
+    sa.ForeignKeyConstraint(['incidentkey'], ['incident.incidentkey'], ),
+    sa.PrimaryKeyConstraint('apparatuskey')
+    )
+    op.create_index(op.f('ix_apparatus_apparatuskey'), 'apparatus', ['apparatuskey'], unique=False)
+    op.create_table('auv_incidentapparatus',
+    sa.Column('apparatuskey', sa.String(length=14), nullable=False),
+    sa.Column('incidentkey', sa.String(length=14), nullable=True),
+    sa.Column('apparatusid', sa.String(length=20), nullable=True),
+    sa.Column('deptunitornotcode', sa.Integer(), nullable=True),
+    sa.Column('deptunitornotdescrip', sa.String(length=50), nullable=True),
+    sa.Column('priorityresponsecode', sa.Integer(), nullable=True),
+    sa.Column('priorityresponsedescrip', sa.String(length=50), nullable=True),
+    sa.Column('cancelledenroutecode', sa.Integer(), nullable=True),
+    sa.Column('cancelledenroutedescrip', sa.String(length=50), nullable=True),
+    sa.Column('firstarrivingunitcode', sa.Integer(), nullable=True),
+    sa.Column('firstarrivingunitdescrip', sa.String(length=50), nullable=True),
+    sa.Column('dispatchtype', sa.Integer(), nullable=True),
+    sa.Column('dispatchtypedescrip', sa.String(length=100), nullable=True),
+    sa.Column('respondedfromquarterscode', sa.Integer(), nullable=True),
+    sa.Column('respondedfromquarterdescrip', sa.String(length=100), nullable=True),
+    sa.Column('mainapparatususecode', sa.Integer(), nullable=True),
+    sa.Column('mainapparatususedescrip', sa.String(length=100), nullable=True),
+    sa.Column('apparatustypecode', sa.Integer(), nullable=True),
+    sa.Column('apparatustypedescrip', sa.String(length=100), nullable=True),
+    sa.Column('actiontaken1code', sa.String(length=10), nullable=True),
+    sa.Column('actiontaken1descip', sa.String(length=255), nullable=True),
+    sa.Column('actiontaken2code', sa.String(length=10), nullable=True),
+    sa.Column('actiontaken2descip', sa.String(length=255), nullable=True),
+    sa.Column('actiontaken3code', sa.String(length=10), nullable=True),
+    sa.Column('actiontaken3descip', sa.String(length=255), nullable=True),
+    sa.Column('actiontaken4code', sa.String(length=10), nullable=True),
+    sa.Column('actiontaken4descip', sa.String(length=255), nullable=True),
+    sa.Column('numberofresponders', sa.Integer(), nullable=True),
+    sa.Column('dispatchdatetime', sa.DateTime(), nullable=True),
+    sa.Column('dispatchtime', sa.String(length=10), nullable=True),
+    sa.Column('dispatchdate', sa.Date(), nullable=True),
+    sa.Column('dispatchenroutetime', sa.String(length=10), nullable=True),
+    sa.Column('dispatchenroutediffseconds', sa.Integer(), nullable=True),
+    sa.Column('enroutetoscenedatetime', sa.DateTime(), nullable=True),
+    sa.Column('enroutetoscenetime', sa.String(length=10), nullable=True),
+    sa.Column('enroutetoscenedate', sa.Date(), nullable=True),
+    sa.Column('enroutearrivalscenetime', sa.String(length=10), nullable=True),
+    sa.Column('enroutearrivalscenediffseconds', sa.Integer(), nullable=True),
+    sa.Column('responsetime', sa.String(length=10), nullable=True),
+    sa.Column('responsetimeseconds', sa.Integer(), nullable=True),
+    sa.Column('arrivaldatetime', sa.DateTime(), nullable=True),
+    sa.Column('arrivaltime', sa.String(length=10), nullable=True),
+    sa.Column('arrivaldate', sa.Date(), nullable=True),
+    sa.Column('arrivaltoenroutehospdifftime', sa.String(length=10), nullable=True),
+    sa.Column('arrivaltoenroutehospdiffseconds', sa.Integer(), nullable=True),
+    sa.Column('enroutetohospitaldatetime', sa.DateTime(), nullable=True),
+    sa.Column('enroutetohospitaltime', sa.String(length=10), nullable=True),
+    sa.Column('enroutetohospitaldate', sa.Date(), nullable=True),
+    sa.Column('enroutetoarrivalhospdifftime', sa.String(length=10), nullable=True),
+    sa.Column('enroutetoarrivalhospdiffseconds', sa.Integer(), nullable=True),
+    sa.Column('arrivalscenetoarrivalhospdifftime', sa.String(length=10), nullable=True),
+    sa.Column('arrivalscenetoarrivalhospdiffseconds', sa.Integer(), nullable=True),
+    sa.Column('hospitalarrivaldatetime', sa.DateTime(), nullable=True),
+    sa.Column('hospitalarrivaltime', sa.String(length=10), nullable=True),
+    sa.Column('hospitalarrivaldate', sa.Date(), nullable=True),
+    sa.Column('arrivalclearhospdifftime', sa.String(length=10), nullable=True),
+    sa.Column('arrivalclearhospdiffseconds', sa.Integer(), nullable=True),
+    sa.Column('cleardatetime', sa.DateTime(), nullable=True),
+    sa.Column('cleartime', sa.String(length=10), nullable=True),
+    sa.Column('cleardate', sa.Date(), nullable=True),
+    sa.Column('dispatchcleardifftime', sa.String(length=10), nullable=True),
+    sa.Column('dispatchcleardiffseconds', sa.Integer(), nullable=True),
+    sa.Column('inservicedatetime', sa.DateTime(), nullable=True),
+    sa.Column('inservicetime', sa.String(length=10), nullable=True),
+    sa.Column('inservicedate', sa.Date(), nullable=True),
+    sa.Column('emsruncode', sa.String(length=10), nullable=True),
+    sa.Column('emsrundescrip', sa.String(length=100), nullable=True),
+    sa.Column('emsrunnumber', sa.Integer(), nullable=True),
+    sa.Column('losapcode', sa.Integer(), nullable=True),
+    sa.Column('losapdescrip', sa.String(length=100), nullable=True),
+    sa.Column('alarmscode', sa.Integer(), nullable=True),
+    sa.Column('alarmdescrip', sa.String(length=100), nullable=True),
+    sa.Column('amount1', sa.Integer(), nullable=True),
+    sa.Column('amount2', sa.Integer(), nullable=True),
+    sa.Column('fdid_no', sa.String(length=20), nullable=True),
+    sa.Column('stagingdatetime', sa.DateTime(), nullable=True),
+    sa.Column('stagingtime', sa.String(length=10), nullable=True),
+    sa.Column('stagingdate', sa.Date(), nullable=True),
+    sa.Column('AtPatientSideDateTime', sa.DateTime(), nullable=True),
+    sa.Column('AtPatientSideTime', sa.String(length=10), nullable=True),
+    sa.Column('AtPatientSideDate', sa.Date(), nullable=True),
+    sa.Column('FacilityDateTime', sa.DateTime(), nullable=True),
+    sa.Column('FacilityTime', sa.String(length=10), nullable=True),
+    sa.Column('FacilityDate', sa.Date(), nullable=True),
+    sa.Column('changedate', sa.DateTime(), nullable=True),
+    sa.Column('created', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
+    sa.ForeignKeyConstraint(['incidentkey'], ['incident.incidentkey'], ),
+    sa.PrimaryKeyConstraint('apparatuskey')
+    )
+    op.create_index(op.f('ix_auv_incidentapparatus_apparatuskey'), 'auv_incidentapparatus', ['apparatuskey'], unique=False)
+    op.create_table('personnel',
+    sa.Column('personnelkey', sa.String(length=14), nullable=False),
+    sa.Column('incidentkey', sa.String(length=14), nullable=True),
+    sa.Column('apparatuskey', sa.String(length=14), nullable=True),
+    sa.Column('pslid', sa.String(length=14), nullable=True),
+    sa.Column('rosid', sa.String(length=14), nullable=True),
+    sa.Column('personnelid', sa.String(length=9), nullable=True),
+    sa.Column('lastname', sa.String(length=25), nullable=True),
+    sa.Column('firstname', sa.String(length=25), nullable=True),
+    sa.Column('middleinitial', sa.String(length=1), nullable=True),
+    sa.Column('namesuffix', sa.String(length=4), nullable=True),
+    sa.Column('rank', sa.String(length=10), nullable=True),
+    sa.Column('actiontaken1', sa.String(length=4), nullable=True),
+    sa.Column('actiontaken2', sa.String(length=4), nullable=True),
+    sa.Column('actiontaken3', sa.String(length=4), nullable=True),
+    sa.Column('actiontaken4', sa.String(length=4), nullable=True),
+    sa.Column('amount1', sa.Float(), nullable=True),
+    sa.Column('amount2', sa.Float(), nullable=True),
+    sa.Column('changedate', sa.DateTime(), nullable=True),
+    sa.Column('rowguid', sa.String(), nullable=True),
+    sa.Column('crole', sa.String(length=4), nullable=True),
+    sa.Column('lLosap_credit', sa.Boolean(), nullable=True),
+    sa.Column('MedCert', sa.String(length=4), nullable=True),
+    sa.Column('cAdditionalRole', sa.String(length=8), nullable=True),
+    sa.Column('AgencyID', sa.String(length=14), nullable=True),
+    sa.Column('AgencyDesc', sa.String(length=40), nullable=True),
+    sa.Column('AgencyCode', sa.String(length=8), nullable=True),
+    sa.Column('lNFIRSExported', sa.Boolean(), nullable=True),
+    sa.Column('NFIRSExportedDate', sa.DateTime(), nullable=True),
+    sa.Column('iNFIRSSequence', sa.Integer(), nullable=True),
+    sa.Column('NFIRSTransactiontype', sa.String(length=1), nullable=True),
+    sa.Column('created', sa.DateTime(), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
+    sa.ForeignKeyConstraint(['apparatuskey'], ['apparatus.incidentkey'], ),
+    sa.ForeignKeyConstraint(['incidentkey'], ['incident.incidentkey'], ),
+    sa.PrimaryKeyConstraint('personnelkey')
+    )
+    op.create_index(op.f('ix_personnel_personnelkey'), 'personnel', ['personnelkey'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_personnel_personnelkey'), table_name='personnel')
+    op.drop_table('personnel')
+    op.drop_index(op.f('ix_auv_incidentapparatus_apparatuskey'), table_name='auv_incidentapparatus')
+    op.drop_table('auv_incidentapparatus')
+    op.drop_index(op.f('ix_apparatus_apparatuskey'), table_name='apparatus')
+    op.drop_table('apparatus')
+    op.drop_index(op.f('ix_incident_incidentkey'), table_name='incident')
+    op.drop_table('incident')
+    op.drop_table('auv_incidentpersonnel')
+    op.drop_index(op.f('ix_auv_incidentbase_incidentkey'), table_name='auv_incidentbase')
+    op.drop_table('auv_incidentbase')
+    # ### end Alembic commands ###

feed_data.py

@@ -0,0 +1,161 @@
+import asyncio
+from datetime import time, timedelta, datetime
+import pandas as pd
+import numpy as np
+from sqlalchemy import select
+from src.configs import DatabaseConfig
+from src.entities.incident import IncidentModel
+from src.entities.apparatus import ApparatusModel
+from src.entities.personnel import PersonnelModel
+from src.entities.auv_incidentbase import IncidentBaseModel
+from src.entities.auv_incidentapparatus import IncidentApparatusModel
+from src.entities.auv_incidentpersonnel import IncidentPersonnelModel
+
+
+EXCEL_FILE = "ProjectTablesData.xlsx"
+
+EXCEL_SHEET_MODEL_MAP = {
+    0: IncidentModel,
+    1: ApparatusModel,
+    2: PersonnelModel,
+    3: IncidentBaseModel,
+    4: IncidentApparatusModel,
+    5: IncidentPersonnelModel
+}
+
+
+def clean_value(value):
+
+    # Handle NaN
+    try:
+        if pd.isna(value):
+            return None
+    except (TypeError, ValueError):
+        pass
+
+    # Handle pandas Timestamp → return datetime object (NOT string)
+    if isinstance(value, pd.Timestamp):
+        if value == pd.Timestamp("1900-01-01"):  # Excel empty date default
+            return None
+        return value.to_pydatetime()  # ✅ Return actual datetime, not string
+
+    # Convert Python time -> string
+    if isinstance(value, time):
+        return value.strftime("%H:%M:%S")
+
+    # Convert timedelta -> string
+    if isinstance(value, timedelta):
+        total_seconds = int(value.total_seconds())
+        h = total_seconds // 3600
+        m = (total_seconds % 3600) // 60
+        s = total_seconds % 60
+        return f"{h:02}:{m:02}:{s:02}"
+
+    # Convert numpy types
+    if isinstance(value, np.generic):
+        return value.item()
+
+    # Strip strings
+    if isinstance(value, str):
+        value = value.strip()
+        return value if value else None
+
+    return value
+
+
+def get_model_columns(model):
+    """Extract SQLAlchemy column names"""
+    return {column.name for column in model.__table__.columns}
+
+
+def get_primary_keys(model):
+    """Get primary key column names"""
+    return [column.name for column in model.__table__.primary_key.columns]
+
+
+def row_to_model(model, row):
+    """Convert pandas row → SQLAlchemy model"""
+    model_columns = get_model_columns(model)
+
+    data = {}
+
+    for column in model_columns:
+        if column in row:
+            data[column] = clean_value(row[column])
+
+    return model(**data)
+
+
+async def get_existing_primary_keys(session, model, pk_column):
+    """
+    Fetch existing primary keys from DB
+    """
+    result = await session.execute(
+        select(getattr(model, pk_column))
+    )
+
+    return {row[0] for row in result.fetchall()}
+
+
+async def ingest_excel():
+
+    print("Loading Excel file...")
+
+    excel_data = pd.read_excel(EXCEL_FILE, sheet_name=None)
+
+    async with DatabaseConfig.async_session() as session:
+
+        total_inserted = 0
+
+        for sheet_index, model in EXCEL_SHEET_MODEL_MAP.items():
+
+            sheet_name = list(excel_data.keys())[sheet_index]
+
+            print(f"\nProcessing Sheet: {sheet_name}")
+            print(f"Mapped Model: {model.__name__}")
+
+            df = excel_data[sheet_name]
+
+            pk_columns = get_primary_keys(model)
+
+            existing_keys = set()
+            seen_keys = set()
+
+            if pk_columns:
+                pk_column = pk_columns[0]
+                existing_keys = await get_existing_primary_keys(session, model, pk_column)
+
+            objects = []
+            skipped = 0
+
+            for _, row in df.iterrows():
+
+                obj = row_to_model(model, row)
+
+                if pk_columns:
+                    pk_value = getattr(obj, pk_columns[0], None)
+
+                    if pk_value in existing_keys or pk_value in seen_keys:
+                        skipped += 1
+                        continue
+
+                    seen_keys.add(pk_value)
+
+                objects.append(obj)
+
+            session.add_all(objects)
+
+            inserted = len(objects)
+
+            print(f"Inserted: {inserted}")
+            print(f"Skipped duplicates: {skipped}")
+
+            total_inserted += inserted
+
+        await session.commit()
+
+        print("\nTotal rows inserted:", total_inserted)
+
+
+if __name__ == "__main__":
+    asyncio.run(ingest_excel())

poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 2.3.2 and should not be changed by hand.
+# This file is automatically @generated by Poetry 2.3.1 and should not be changed by hand.
 
 [[package]]
 name = "aiofiles"
@@ -506,6 +506,18 @@ files = [
     {file = "durationpy-0.10.tar.gz", hash = "sha256:1fa6893409a6e739c9c72334fc65cca1f355dbdd93405d30f726deb5bde42fba"},
 ]
 
+[[package]]
+name = "et-xmlfile"
+version = "2.0.0"
+description = "An implementation of lxml.xmlfile for the standard library"
+optional = false
+python-versions = ">=3.8"
+groups = ["main"]
+files = [
+    {file = "et_xmlfile-2.0.0-py3-none-any.whl", hash = "sha256:7a91720bc756843502c3b7504c77b8fe44217c85c537d85037f0f536151b2caa"},
+    {file = "et_xmlfile-2.0.0.tar.gz", hash = "sha256:dab3f4764309081ce75662649be815c4c9081e88f0837825f90fd28317d4da54"},
+]
+
 [[package]]
 name = "fastapi"
 version = "0.135.1"
@@ -1704,6 +1716,21 @@ datalib = ["numpy (>=1)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)"]
 realtime = ["websockets (>=13,<16)"]
 voice-helpers = ["numpy (>=2.0.2)", "sounddevice (>=0.5.1)"]
 
+[[package]]
+name = "openpyxl"
+version = "3.1.5"
+description = "A Python library to read/write Excel 2010 xlsx/xlsm files"
+optional = false
+python-versions = ">=3.8"
+groups = ["main"]
+files = [
+    {file = "openpyxl-3.1.5-py2.py3-none-any.whl", hash = "sha256:5282c12b107bffeef825f4617dc029afaf41d0ea60823bbb665ef3079dc79de2"},
+    {file = "openpyxl-3.1.5.tar.gz", hash = "sha256:cf0e3cf56142039133628b5acffe8ef0c12bc902d2aadd3e0fe5878dc08d1050"},
+]
+
+[package.dependencies]
+et-xmlfile = "*"
+
 [[package]]
 name = "opentelemetry-api"
 version = "1.40.0"
@@ -1915,6 +1942,95 @@ files = [
     {file = "packaging-26.0.tar.gz", hash = "sha256:00243ae351a257117b6a241061796684b084ed1c516a08c48a3f7e147a9d80b4"},
 ]
 
+[[package]]
+name = "pandas"
+version = "3.0.1"
+description = "Powerful data structures for data analysis, time series, and statistics"
+optional = false
+python-versions = ">=3.11"
+groups = ["main"]
+files = [
+    {file = "pandas-3.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:de09668c1bf3b925c07e5762291602f0d789eca1b3a781f99c1c78f6cac0e7ea"},
+    {file = "pandas-3.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:24ba315ba3d6e5806063ac6eb717504e499ce30bd8c236d8693a5fd3f084c796"},
+    {file = "pandas-3.0.1-cp311-cp311-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:406ce835c55bac912f2a0dcfaf27c06d73c6b04a5dde45f1fd3169ce31337389"},
+    {file = "pandas-3.0.1-cp311-cp311-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:830994d7e1f31dd7e790045235605ab61cff6c94defc774547e8b7fdfbff3dc7"},
+    {file = "pandas-3.0.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:a64ce8b0f2de1d2efd2ae40b0abe7f8ae6b29fbfb3812098ed5a6f8e235ad9bf"},
+    {file = "pandas-3.0.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:9832c2c69da24b602c32e0c7b1b508a03949c18ba08d4d9f1c1033426685b447"},
+    {file = "pandas-3.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:84f0904a69e7365f79a0c77d3cdfccbfb05bf87847e3a51a41e1426b0edb9c79"},
+    {file = "pandas-3.0.1-cp311-cp311-win_arm64.whl", hash = "sha256:4a68773d5a778afb31d12e34f7dd4612ab90de8c6fb1d8ffe5d4a03b955082a1"},
+    {file = "pandas-3.0.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:476f84f8c20c9f5bc47252b66b4bb25e1a9fc2fa98cead96744d8116cb85771d"},
+    {file = "pandas-3.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0ab749dfba921edf641d4036c4c21c0b3ea70fea478165cb98a998fb2a261955"},
+    {file = "pandas-3.0.1-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b8e36891080b87823aff3640c78649b91b8ff6eea3c0d70aeabd72ea43ab069b"},
+    {file = "pandas-3.0.1-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:532527a701281b9dd371e2f582ed9094f4c12dd9ffb82c0c54ee28d8ac9520c4"},
+    {file = "pandas-3.0.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:356e5c055ed9b0da1580d465657bc7d00635af4fd47f30afb23025352ba764d1"},
+    {file = "pandas-3.0.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:9d810036895f9ad6345b8f2a338dd6998a74e8483847403582cab67745bff821"},
+    {file = "pandas-3.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:536232a5fe26dd989bd633e7a0c450705fdc86a207fec7254a55e9a22950fe43"},
+    {file = "pandas-3.0.1-cp312-cp312-win_arm64.whl", hash = "sha256:0f463ebfd8de7f326d38037c7363c6dacb857c5881ab8961fb387804d6daf2f7"},
+    {file = "pandas-3.0.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5272627187b5d9c20e55d27caf5f2cd23e286aba25cadf73c8590e432e2b7262"},
+    {file = "pandas-3.0.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:661e0f665932af88c7877f31da0dc743fe9c8f2524bdffe23d24fdcb67ef9d56"},
+    {file = "pandas-3.0.1-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:75e6e292ff898679e47a2199172593d9f6107fd2dd3617c22c2946e97d5df46e"},
+    {file = "pandas-3.0.1-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1ff8cf1d2896e34343197685f432450ec99a85ba8d90cce2030c5eee2ef98791"},
+    {file = "pandas-3.0.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:eca8b4510f6763f3d37359c2105df03a7a221a508f30e396a51d0713d462e68a"},
+    {file = "pandas-3.0.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:06aff2ad6f0b94a17822cf8b83bbb563b090ed82ff4fe7712db2ce57cd50d9b8"},
+    {file = "pandas-3.0.1-cp313-cp313-win_amd64.whl", hash = "sha256:9fea306c783e28884c29057a1d9baa11a349bbf99538ec1da44c8476563d1b25"},
+    {file = "pandas-3.0.1-cp313-cp313-win_arm64.whl", hash = "sha256:a8d37a43c52917427e897cb2e429f67a449327394396a81034a4449b99afda59"},
+    {file = "pandas-3.0.1-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:d54855f04f8246ed7b6fc96b05d4871591143c46c0b6f4af874764ed0d2d6f06"},
+    {file = "pandas-3.0.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:4e1b677accee34a09e0dc2ce5624e4a58a1870ffe56fc021e9caf7f23cd7668f"},
+    {file = "pandas-3.0.1-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a9cabbdcd03f1b6cd254d6dda8ae09b0252524be1592594c00b7895916cb1324"},
+    {file = "pandas-3.0.1-cp313-cp313t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5ae2ab1f166668b41e770650101e7090824fd34d17915dd9cd479f5c5e0065e9"},
+    {file = "pandas-3.0.1-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:6bf0603c2e30e2cafac32807b06435f28741135cb8697eae8b28c7d492fc7d76"},
+    {file = "pandas-3.0.1-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:6c426422973973cae1f4a23e51d4ae85974f44871b24844e4f7de752dd877098"},
+    {file = "pandas-3.0.1-cp313-cp313t-win_amd64.whl", hash = "sha256:b03f91ae8c10a85c1613102c7bef5229b5379f343030a3ccefeca8a33414cf35"},
+    {file = "pandas-3.0.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:99d0f92ed92d3083d140bf6b97774f9f13863924cf3f52a70711f4e7588f9d0a"},
+    {file = "pandas-3.0.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:3b66857e983208654294bb6477b8a63dee26b37bdd0eb34d010556e91261784f"},
+    {file = "pandas-3.0.1-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:56cf59638bf24dc9bdf2154c81e248b3289f9a09a6d04e63608c159022352749"},
+    {file = "pandas-3.0.1-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c1a9f55e0f46951874b863d1f3906dcb57df2d9be5c5847ba4dfb55b2c815249"},
+    {file = "pandas-3.0.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:1849f0bba9c8a2fb0f691d492b834cc8dadf617e29015c66e989448d58d011ee"},
+    {file = "pandas-3.0.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:c3d288439e11b5325b02ae6e9cc83e6805a62c40c5a6220bea9beb899c073b1c"},
+    {file = "pandas-3.0.1-cp314-cp314-win_amd64.whl", hash = "sha256:93325b0fe372d192965f4cca88d97667f49557398bbf94abdda3bf1b591dbe66"},
+    {file = "pandas-3.0.1-cp314-cp314-win_arm64.whl", hash = "sha256:97ca08674e3287c7148f4858b01136f8bdfe7202ad25ad04fec602dd1d29d132"},
+    {file = "pandas-3.0.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:58eeb1b2e0fb322befcf2bbc9ba0af41e616abadb3d3414a6bc7167f6cbfce32"},
+    {file = "pandas-3.0.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:cd9af1276b5ca9e298bd79a26bda32fa9cc87ed095b2a9a60978d2ca058eaf87"},
+    {file = "pandas-3.0.1-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:94f87a04984d6b63788327cd9f79dda62b7f9043909d2440ceccf709249ca988"},
+    {file = "pandas-3.0.1-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:85fe4c4df62e1e20f9db6ebfb88c844b092c22cd5324bdcf94bfa2fc1b391221"},
+    {file = "pandas-3.0.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:331ca75a2f8672c365ae25c0b29e46f5ac0c6551fdace8eec4cd65e4fac271ff"},
+    {file = "pandas-3.0.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:15860b1fdb1973fffade772fdb931ccf9b2f400a3f5665aef94a00445d7d8dd5"},
+    {file = "pandas-3.0.1-cp314-cp314t-win_amd64.whl", hash = "sha256:44f1364411d5670efa692b146c748f4ed013df91ee91e9bec5677fb1fd58b937"},
+    {file = "pandas-3.0.1-cp314-cp314t-win_arm64.whl", hash = "sha256:108dd1790337a494aa80e38def654ca3f0968cf4f362c85f44c15e471667102d"},
+    {file = "pandas-3.0.1.tar.gz", hash = "sha256:4186a699674af418f655dbd420ed87f50d56b4cd6603784279d9eef6627823c8"},
+]
+
+[package.dependencies]
+numpy = {version = ">=1.26.0", markers = "python_version < \"3.14\""}
+python-dateutil = ">=2.8.2"
+tzdata = {version = "*", markers = "sys_platform == \"win32\" or sys_platform == \"emscripten\""}
+
+[package.extras]
+all = ["PyQt5 (>=5.15.9)", "SQLAlchemy (>=2.0.36)", "adbc-driver-postgresql (>=1.2.0)", "adbc-driver-sqlite (>=1.2.0)", "beautifulsoup4 (>=4.12.3)", "bottleneck (>=1.4.2)", "fastparquet (>=2024.11.0)", "fsspec (>=2024.10.0)", "gcsfs (>=2024.10.0)", "html5lib (>=1.1)", "hypothesis (>=6.116.0)", "jinja2 (>=3.1.5)", "lxml (>=5.3.0)", "matplotlib (>=3.9.3)", "numba (>=0.60.0)", "numexpr (>=2.10.2)", "odfpy (>=1.4.1)", "openpyxl (>=3.1.5)", "psycopg2 (>=2.9.10)", "pyarrow (>=13.0.0)", "pyiceberg (>=0.8.1)", "pymysql (>=1.1.1)", "pyreadstat (>=1.2.8)", "pytest (>=8.3.4)", "pytest-xdist (>=3.6.1)", "python-calamine (>=0.3.0)", "pytz (>=2024.2)", "pyxlsb (>=1.0.10)", "qtpy (>=2.4.2)", "s3fs (>=2024.10.0)", "scipy (>=1.14.1)", "tables (>=3.10.1)", "tabulate (>=0.9.0)", "xarray (>=2024.10.0)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.2.0)", "zstandard (>=0.23.0)"]
+aws = ["s3fs (>=2024.10.0)"]
+clipboard = ["PyQt5 (>=5.15.9)", "qtpy (>=2.4.2)"]
+compression = ["zstandard (>=0.23.0)"]
+computation = ["scipy (>=1.14.1)", "xarray (>=2024.10.0)"]
+excel = ["odfpy (>=1.4.1)", "openpyxl (>=3.1.5)", "python-calamine (>=0.3.0)", "pyxlsb (>=1.0.10)", "xlrd (>=2.0.1)", "xlsxwriter (>=3.2.0)"]
+feather = ["pyarrow (>=13.0.0)"]
+fss = ["fsspec (>=2024.10.0)"]
+gcp = ["gcsfs (>=2024.10.0)"]
+hdf5 = ["tables (>=3.10.1)"]
+html = ["beautifulsoup4 (>=4.12.3)", "html5lib (>=1.1)", "lxml (>=5.3.0)"]
+iceberg = ["pyiceberg (>=0.8.1)"]
+mysql = ["SQLAlchemy (>=2.0.36)", "pymysql (>=1.1.1)"]
+output-formatting = ["jinja2 (>=3.1.5)", "tabulate (>=0.9.0)"]
+parquet = ["pyarrow (>=13.0.0)"]
+performance = ["bottleneck (>=1.4.2)", "numba (>=0.60.0)", "numexpr (>=2.10.2)"]
+plot = ["matplotlib (>=3.9.3)"]
+postgresql = ["SQLAlchemy (>=2.0.36)", "adbc-driver-postgresql (>=1.2.0)", "psycopg2 (>=2.9.10)"]
+pyarrow = ["pyarrow (>=13.0.0)"]
+spss = ["pyreadstat (>=1.2.8)"]
+sql-other = ["SQLAlchemy (>=2.0.36)", "adbc-driver-postgresql (>=1.2.0)", "adbc-driver-sqlite (>=1.2.0)"]
+test = ["hypothesis (>=6.116.0)", "pytest (>=8.3.4)", "pytest-xdist (>=3.6.1)"]
+timezone = ["pytz (>=2024.2)"]
+xml = ["lxml (>=5.3.0)"]
+
 [[package]]
 name = "protobuf"
 version = "6.33.5"
@@ -3069,6 +3185,19 @@ files = [
 [package.dependencies]
 typing-extensions = ">=4.12.0"
 
+[[package]]
+name = "tzdata"
+version = "2025.3"
+description = "Provider of IANA time zone data"
+optional = false
+python-versions = ">=2"
+groups = ["main"]
+markers = "sys_platform == \"win32\" or sys_platform == \"emscripten\""
+files = [
+    {file = "tzdata-2025.3-py2.py3-none-any.whl", hash = "sha256:06a47e5700f3081aab02b2e513160914ff0694bce9947d6b76ebd6bf57cfc5d1"},
+    {file = "tzdata-2025.3.tar.gz", hash = "sha256:de39c2ca5dc7b0344f2eba86f49d614019d29f060fc4ebc8a417896a620b56a7"},
+]
+
 [[package]]
 name = "urllib3"
 version = "2.6.3"
@@ -3427,4 +3556,4 @@ type = ["pytest-mypy"]
 [metadata]
 lock-version = "2.1"
 python-versions = "3.12.*"
-content-hash = "6d598f8d3c82ab1e51e33fb9082f9a4777b0a292c4251c3d7e7efc68541451a0"
+content-hash = "21ee864f85b2d6dd24179501b87e6d32ceac766d4acc9ec5d77645d20cf8037f"

pyproject.toml

@@ -18,7 +18,10 @@ dependencies = [
     "pydantic-ai-slim (>=1.67.0,<2.0.0)",
     "openai (>=2.26.0,<3.0.0)",
     "chromadb (>=1.5.5,<2.0.0)",
-    "aiofiles (>=25.1.0,<26.0.0)"
+    "aiofiles (>=25.1.0,<26.0.0)",
+    "pandas (>=3.0.1,<4.0.0)",
+    "openpyxl (>=3.1.5,<4.0.0)",
+    "numpy (>=2.4.3,<3.0.0)"
 ]
 
 

src/entities/__init__.py

@@ -1,4 +1,10 @@
 from fastapi import APIRouter
+from .incident import *
+from .apparatus import *
+from .personnel import *
+from .auv_incidentbase import *
+from .auv_incidentapparatus import *
+from .auv_incidentpersonnel import *
 
 from .apparatus import *
 from .incident import *

src/entities/apparatus/_model.py

@@ -36,7 +36,7 @@ class ApparatusModel(BaseModel_):
     inservicetime = Column(DateTime, nullable=True)
     respondfromquarters = Column(Boolean, nullable=True)
     changedate = Column(DateTime, nullable=True)
-    rowguid = Column(String(36), nullable=False)
+    rowguid = Column(String(36), nullable=True)
     hydrant_idnumber = Column(String(20), nullable=True)
     hydrant_location = Column(String(116), nullable=True)
     alarms = Column(String(10), nullable=True)
@@ -65,4 +65,5 @@ class ApparatusModel(BaseModel_):
     responsetime = Column(String(20), nullable=True)
     turntime = Column(String(20), nullable=True)
     
-    incident = relationship("Incident", back_populates="apparatus")
+    incident = relationship("IncidentModel", back_populates="apparatus")
+    personnel = relationship("PersonnelModel", back_populates="apparatus")

src/entities/auv_incidentapparatus/_model.py

@@ -35,41 +35,41 @@ class IncidentApparatusModel(BaseModel_):
     actiontaken4descip = Column(String(255))
     numberofresponders = Column(Integer)
     dispatchdatetime = Column(DateTime)
-    dispatchtime = Column(Time)
+    dispatchtime = Column(String(10))
     dispatchdate = Column(Date)
-    dispatchenroutetime = Column(Time)
+    dispatchenroutetime = Column(String(10))
     dispatchenroutediffseconds = Column(Integer)
     enroutetoscenedatetime = Column(DateTime)
-    enroutetoscenetime = Column(Time)
+    enroutetoscenetime = Column(String(10))
     enroutetoscenedate = Column(Date)
-    enroutearrivalscenetime = Column(Time)
+    enroutearrivalscenetime = Column(String(10))
     enroutearrivalscenediffseconds = Column(Integer)
-    responsetime = Column(Time)
+    responsetime = Column(String(10))
     responsetimeseconds = Column(Integer)
     arrivaldatetime = Column(DateTime)
-    arrivaltime = Column(Time)
+    arrivaltime = Column(String(10))
     arrivaldate = Column(Date)
-    arrivaltoenroutehospdifftime = Column(Time)
+    arrivaltoenroutehospdifftime = Column(String(10))
     arrivaltoenroutehospdiffseconds = Column(Integer)
     enroutetohospitaldatetime = Column(DateTime)
-    enroutetohospitaltime = Column(Time)
+    enroutetohospitaltime = Column(String(10))
     enroutetohospitaldate = Column(Date)
-    enroutetoarrivalhospdifftime = Column(Time)
+    enroutetoarrivalhospdifftime = Column(String(10))
     enroutetoarrivalhospdiffseconds = Column(Integer)
-    arrivalscenetoarrivalhospdifftime = Column(Time)
+    arrivalscenetoarrivalhospdifftime = Column(String(10))
     arrivalscenetoarrivalhospdiffseconds = Column(Integer)
     hospitalarrivaldatetime = Column(DateTime)
-    hospitalarrivaltime = Column(Time)
+    hospitalarrivaltime = Column(String(10))
     hospitalarrivaldate = Column(Date)
-    arrivalclearhospdifftime = Column(Time)
+    arrivalclearhospdifftime = Column(String(10))
     arrivalclearhospdiffseconds = Column(Integer)
     cleardatetime = Column(DateTime)
-    cleartime = Column(Time)
+    cleartime = Column(String(10))
     cleardate = Column(Date)
-    dispatchcleardifftime = Column(Time)
+    dispatchcleardifftime = Column(String(10))
     dispatchcleardiffseconds = Column(Integer)
     inservicedatetime = Column(DateTime)
-    inservicetime = Column(Time)
+    inservicetime = Column(String(10))
     inservicedate = Column(Date)
     emsruncode = Column(String(10))
     emsrundescrip = Column(String(100))
@@ -82,14 +82,14 @@ class IncidentApparatusModel(BaseModel_):
     amount2 = Column(Integer)
     fdid_no = Column(String(20))
     stagingdatetime = Column(DateTime)
-    stagingtime = Column(Time)
+    stagingtime = Column(String(10))
     stagingdate = Column(Date)
     AtPatientSideDateTime = Column(DateTime)
-    AtPatientSideTime = Column(Time)
+    AtPatientSideTime = Column(String(10))
     AtPatientSideDate = Column(Date)
     FacilityDateTime = Column(DateTime)
-    FacilityTime = Column(Time)
+    FacilityTime = Column(String(10))
     FacilityDate = Column(Date)
     changedate = Column(DateTime)
 
-    incident = relationship("Incident", back_populates="apparatus")
+    incident = relationship("IncidentModel", back_populates="incident_apparatus")

src/entities/auv_incidentpersonnel/_model.py

@@ -1,10 +1,13 @@
 from sqlalchemy import Column, String, Integer, Float
+from sqlalchemy.orm import mapped_column
 from ..base import BaseModel_
 
+
 class IncidentPersonnelModel(BaseModel_):
     __tablename__ = "auv_incidentpersonnel"
 
-    personnelkey = Column(String(14), primary_key=True, index=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    personnelkey = Column(String(14))
     namefirst = Column(String(25))
     namemi = Column(String(2))
     namelast = Column(String(25))

src/entities/incident/_model.py

@@ -2,6 +2,7 @@ from sqlalchemy import Column, String, Integer, Float, Boolean, DateTime, Text,
 from sqlalchemy.orm import relationship
 from ..base import BaseModel_
 
+
 class IncidentModel(BaseModel_):
     __tablename__ = "incident"
 
@@ -10,30 +11,30 @@ class IncidentModel(BaseModel_):
     incidentnumber = Column(String(10))
     exposure = Column(String(3))
     incidentstatus = Column(String(20))
-    reviewstatusflag = Column(Boolean, nullable=False)
-    publicreleaseflag = Column(Boolean, nullable=False)
-    completed = Column(Boolean, nullable=False)
+    reviewstatusflag = Column(Boolean, nullable=True)
+    publicreleaseflag = Column(Boolean, nullable=True)
+    completed = Column(Boolean, nullable=True)
     transactiontype = Column(String(4))
     district = Column(String(10))
     station = Column(String(30))
     shift = Column(String(2))
     company = Column(String(64))
-    incidenttype = Column(String(4), nullable=False)
+    incidenttype = Column(String(4), nullable=True)
     initialdispatchcode = Column(String(25))
-    mutualaidcode = Column(String(4), nullable=False)
+    mutualaidcode = Column(String(4), nullable=True)
     alarmdate = Column(DateTime)
     arrivaldate = Column(DateTime)
-    didnotarriveflag = Column(Boolean, nullable=False)
+    didnotarriveflag = Column(Boolean, nullable=True)
     controlleddate = Column(DateTime)
     lastunitcleareddate = Column(DateTime)
-    includemutualaidflag = Column(Boolean, nullable=False)
+    includemutualaidflag = Column(Boolean, nullable=True)
     madepartment = Column(String(30))
     madeptincidentno = Column(String(9))
     alarms = Column(Integer)
     actiontaken1 = Column(String(4))
     actiontaken2 = Column(String(4))
     actiontaken3 = Column(String(4))
-    resourceformusedflag = Column(Boolean, nullable=False)
+    resourceformusedflag = Column(Boolean, nullable=True)
     apparatussuppression = Column(Integer)
     apparatusems = Column(Integer)
     apparatusother = Column(Integer)
@@ -52,7 +53,7 @@ class IncidentModel(BaseModel_):
     hazardmaterialreleased = Column(String(4))
     mixeduse = Column(String(4))
     propertyuse = Column(String(4))
-    emsprovidedflag = Column(Boolean, nullable=False)
+    emsprovidedflag = Column(Boolean, nullable=True)
     casualtiesflag = Column(Integer)
     priorityresponseflag = Column(Boolean)
     vendorid = Column(String(20))
@@ -70,7 +71,7 @@ class IncidentModel(BaseModel_):
     directions = Column(Text)
     latitude = Column(String(20))
     longitude = Column(String(20))
-    compositeaddress = Column(String(50), nullable=False)
+    compositeaddress = Column(String(50), nullable=True)
     county = Column(String(20))
     occupancykey = Column(String(14))
     occupancynumber = Column(String(16))
@@ -83,8 +84,8 @@ class IncidentModel(BaseModel_):
     changedate = Column(DateTime)
     rowguid = Column(String(50))
     LogComments = Column(Text)
-    Incident_ID = Column(Integer, nullable=False)
-    loss_not_known = Column(Boolean, nullable=False)
+    Incident_ID = Column(Integer, nullable=True)
+    loss_not_known = Column(Boolean, nullable=True)
     collecteddate = Column(DateTime)
     DispatchIncType = Column(String(80))
     nfscasualtycnt = Column(Integer)
@@ -108,6 +109,6 @@ class IncidentModel(BaseModel_):
     Northing = Column(String(5))
     
     # relationships
-    apparatus = relationship("Apparatus", back_populates="incident")
-    personnel = relationship("Personnel", back_populates="incident")
+    apparatus = relationship("ApparatusModel", back_populates="incident")
+    personnel = relationship("PersonnelModel", back_populates="incident")
     incident_apparatus = relationship("IncidentApparatusModel", back_populates="incident")

src/entities/personnel/_model.py

@@ -24,7 +24,7 @@ class PersonnelModel(BaseModel_):
     amount1 = Column(Float, nullable=True)
     amount2 = Column(Float, nullable=True)
     changedate = Column(DateTime, nullable=True)
-    rowguid = Column(String, nullable=False)
+    rowguid = Column(String, nullable=True)
     crole = Column(String(4), nullable=True)
     lLosap_credit = Column(Boolean, nullable=True)
     MedCert = Column(String(4), nullable=True)
@@ -37,5 +37,5 @@ class PersonnelModel(BaseModel_):
     iNFIRSSequence = Column(Integer, nullable=True)
     NFIRSTransactiontype = Column(String(1), nullable=True)
     
-    incident = relationship("Incident", back_populates="personnel")
-    apparatus = relationship("Apparatus", back_populates="personnel")
+    incident = relationship("IncidentModel", back_populates="personnel")
+    apparatus = relationship("ApparatusModel", back_populates="personnel")