data-science-document-ai 1.61.0__tar.gz → 1.61.1__tar.gz

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: data-science-document-ai
-Version: 1.61.0
+Version: 1.61.1
 Summary: "Document AI repo for data science"
 Author: Naomi Nguyen
 Author-email: naomi.nguyen@forto.com

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "data-science-document-ai"
-version = "1.61.0"
+version = "1.61.1"
 description = "\"Document AI repo for data science\""
 authors = ["Naomi Nguyen <naomi.nguyen@forto.com>", "Kumar Rajendrababu <kumar.rajendrababu@forto.com>", "Igor Tonko <igor.tonko@forto.com>", "Osman Demirel <osman.demirel@forto.com>"]
 packages = [

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/src/constants.py

@@ -93,8 +93,8 @@ formatting_rules = {
     "bookingConfirmation": {
         "pickUpDepotCode": "depot",
         "dropOffDepotCode": "depot",
-        "gateInTerminalCode": "terminal",
-        "pickUpTerminalCode": "terminal",
+        "gateInTerminal": "terminal",
+        "pickUpTerminal": "terminal",
     },
     "deliveryOrder": {"pickUpTerminal": "terminal", "EmptyContainerDepot": "depot"},
 }

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/src/postprocessing/common.py

@@ -723,16 +723,23 @@ async def format_all_entities(result, document_type_code, params, mime_type):
     if document_type_code in ["partnerInvoice", "bundeskasse"]:
         await process_partner_invoice(params, aggregated_data, document_type_code)
 
-    # TODO: This is a temporary change until the terminal codes are updated
-    if document_type_code == "bookingConfirmation":
-        if "gateInTerminalCode" in aggregated_data:
-            aggregated_data["gateInTerminal"] = aggregated_data.pop(
-                "gateInTerminalCode"
-            )
-        if "pickUpTerminalCode" in aggregated_data:
-            aggregated_data["pickUpTerminal"] = aggregated_data.pop(
-                "pickUpTerminalCode"
-            )
+    # Post process terminals with code and name
+    for key in list(aggregated_data):
+        if "terminal" not in key.lower():
+            continue
+
+        entity = aggregated_data.pop(key)
+        formatted = entity.get("formattedValue", {})
+
+        if formatted is None:
+            aggregated_data[key] = {**entity}
+            continue
+
+        aggregated_data[key] = {**entity, "formattedValue": formatted.get("id")}
+        aggregated_data[f"{key}Code"] = {
+            **entity,
+            "formattedValue": formatted.get("code"),
+        }
 
     logger.info("Data Extraction completed successfully")
     return aggregated_data

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/src/prompts/library/bookingConfirmation/evergreen/placeholders.json

@@ -11,12 +11,12 @@
       "nullable": true,
       "description": "It's a contract number between the carrier and Forto Logistics SE & Co KG. Shipment Id 'S' followed by 6, 7, or 8 digits e.g. S9486358 is not a contract number."
     },
-    "pickUpTerminalCode": {
+    "pickUpTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal for cargo pickup during the import shipment."
     },
-    "gateInTerminalCode": {
+    "gateInTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal where cargo is gated in especially Export terminal delivery address. E.g., FULL RETURN TO or Export terminal name."

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/src/prompts/library/bookingConfirmation/hapag-lloyd/placeholders.json

@@ -11,12 +11,12 @@
       "nullable": true,
       "description": "It's a contract number between the carrier and Forto Logistics SE & Co KG. It can be mentioned as Contract No., Contract Reference, or Quotation No. Shipment Id 'S' followed by 6, 7, or 8 digits e.g. S9486358 is not a contract number."
     },
-    "pickUpTerminalCode": {
+    "pickUpTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal for cargo pickup during the import shipment."
     },
-    "gateInTerminalCode": {
+    "gateInTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal where cargo is gated in especially Export terminal delivery address. E.g., Export terminal delivery address, Export terminal location, or Export terminal name."

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/src/prompts/library/bookingConfirmation/maersk/placeholders.json

@@ -11,12 +11,12 @@
       "nullable": true,
       "description": "It's a contract number between the carrier and Forto Logistics SE & Co KG. Shipment Id 'S' followed by 6, 7, or 8 digits e.g. S9486358 is not a contract number."
     },
-    "pickUpTerminalCode": {
+    "pickUpTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal for cargo pickup during the import shipment."
     },
-    "gateInTerminalCode": {
+    "gateInTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal where cargo is gated in especially Export terminal delivery address. E.g., Export terminal delivery address, Export terminal location, or Return Equip Delivery Terminal."

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/src/prompts/library/bookingConfirmation/maersk/prompt.txt

@@ -16,7 +16,7 @@ For Import Shipment: The loaded container / cargo arrives at a port of discharge
 <INSTRUCTIONS>
 - bookingNumber: A unique identifier for the booking.
 
-- gateInTerminalCode: The specific terminal where cargo is gated in. It can be called Return Equip Delivery Terminal and Location interception. This sometimes can be the same as portOfLoading of the First transportLeg.
+- gateInTerminal: The specific terminal where cargo is gated in. It can be called Return Equip Delivery Terminal and Location interception. This sometimes can be the same as portOfLoading of the First transportLeg.
 - gateInReference: A reference code for cargo entering the terminal. If not mentioned explicitly and gateInTerminal is extracted, then use bookingNumber as gateInReference.
 - pickUpTerminal: The specific terminal for cargo pickup. It can be found as Import pick up address(es),  PORT OF DISCHARGE (after the slash '/').
 - pickUpReference: A reference code for cargo pickup. If not mentioned explicitly and pickUpTerminal is extracted, then use bookingNumber as pickUpReference.

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/src/prompts/library/bookingConfirmation/msc/placeholders.json

@@ -11,12 +11,12 @@
       "nullable": true,
       "description": "It's a contract number between the carrier and Forto Logistics SE & Co KG. It can be found as Service Contract/Rate Reff. No. Shipment Id 'S' followed by 6, 7, or 8 digits e.g. S9486358 is not a contract number."
     },
-    "pickUpTerminalCode": {
+    "pickUpTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal for cargo pickup during the import shipment."
     },
-    "gateInTerminalCode": {
+    "gateInTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal where cargo is gated in especially Export terminal delivery address. It can be found as GATE IN AT TERMINAL/DEPOT"

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/src/prompts/library/bookingConfirmation/msc/prompt.txt

@@ -14,7 +14,7 @@ For Import Shipment: The loaded container / cargo arrives at a port of discharge
 <CONTEXT>
 
 <INSTRUCTIONS>
-- gateInTerminalCode: The specific terminal where cargo is gated in. It can be called Return Equip Delivery Terminal and Location interception. This sometimes can be the same as portOfLoading of the First transportLeg.
+- gateInTerminal: The specific terminal where cargo is gated in. It can be called Return Equip Delivery Terminal and Location interception. This sometimes can be the same as portOfLoading of the First transportLeg.
 - gateInReference: A reference code for cargo entering the terminal. If not mentioned explicitly and gateInTerminal is extracted, then use bookingNumber as gateInReference.
 - pickUpTerminal: The specific terminal for cargo pickup. It can be found as Import pick up address(es),  PORT OF DISCHARGE (after the slash '/').
 - pickUpReference: A reference code for cargo pickup. If not mentioned explicitly and pickUpTerminal is extracted, then use bookingNumber as pickUpReference.

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/src/prompts/library/bookingConfirmation/oocl/placeholders.json

@@ -11,12 +11,12 @@
       "nullable": true,
       "description": "It's a contract number between the carrier and Forto Logistics SE & Co KG. It can be referred as Rate Agreement Number or Contract No.. Shipment Id 'S' followed by 6, 7, or 8 digits e.g. S9486358 is not a contract number."
     },
-    "pickUpTerminalCode": {
+    "pickUpTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal for cargo pickup during the import shipment."
     },
-    "gateInTerminalCode": {
+    "gateInTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal where cargo is gated in especially Export terminal delivery address. E.g., FULL RETURN LOCATION"

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/src/prompts/library/bookingConfirmation/oocl/prompt.txt

@@ -19,7 +19,7 @@ For Import Shipment: The loaded container / cargo arrives at a port of discharge
 
 - bookingNumber: Extract the booking number. This information can be found at the top section of the document".
 
-- gateInTerminalCode: The specific terminal where cargo is gated in. It can be called as FULL RETURN LOCATION. This sometimes can be the same as portOfLoading of the First transportLeg.
+- gateInTerminal: The specific terminal where cargo is gated in. It can be called as FULL RETURN LOCATION. This sometimes can be the same as portOfLoading of the First transportLeg.
 - gateInReference: A reference code for cargo entering the terminal. If not mentioned explicitly and gateInTerminal is extracted, then use bookingNumber as gateInReference.
 - pickUpTerminal: The specific terminal for cargo pickup. It can be found as Import pick up address(es),  PORT OF DISCHARGE (after the slash '/').
 - pickUpReference: A reference code for cargo pickup. If not mentioned explicitly and pickUpTerminal is extracted, then use bookingNumber as pickUpReference.

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/src/prompts/library/bookingConfirmation/other/placeholders.json

@@ -11,12 +11,12 @@
       "nullable": true,
       "description": "It's a contract number between the carrier and Forto Logistics SE & Co KG. Shipment Id 'S' followed by 6, 7, or 8 digits e.g. S9486358 is not a contract number."
     },
-    "pickUpTerminalCode": {
+    "pickUpTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal for cargo pickup during the import shipment."
     },
-    "gateInTerminalCode": {
+    "gateInTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal where cargo is gated in especially Export terminal delivery address. It can be found as Gate In At Terminal, Gate in Terminal, Full Return To Terminal, Full Return Location, Cargo Delivery At, Delivery Terminal, Full Return CY, eyc.."

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/src/prompts/library/bookingConfirmation/yangming/placeholders.json

@@ -11,12 +11,12 @@
       "nullable": true,
       "description": "It's a contract number between the carrier and Forto Logistics SE & Co KG. Shipment Id 'S' followed by 6, 7, or 8 digits e.g. S9486358 is not a contract number."
     },
-    "pickUpTerminalCode": {
+    "pickUpTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal for cargo pickup during the import shipment."
     },
-    "gateInTerminalCode": {
+    "gateInTerminal": {
       "type": "STRING",
       "nullable": true,
       "description": "The specific terminal where cargo is gated in especially Export terminal delivery address. It is mentioned as Delivery Terminal."

{data_science_document_ai-1.61.0 → data_science_document_ai-1.61.1}/src/prompts/library/bookingConfirmation/yangming/prompt.txt

@@ -17,7 +17,7 @@ For Import Shipment: The loaded container / cargo arrives at a port of discharge
 - Populate fields as defined in the response schema.
 - Use the data field description to understand the context of the data.
 
-- gateInTerminalCode: The specific terminal where cargo is gated in. It is mentioned as Delivery Terminal. This sometimes can be the same as portOfLoading of the First transportLeg.
+- gateInTerminal: The specific terminal where cargo is gated in. It is mentioned as Delivery Terminal. This sometimes can be the same as portOfLoading of the First transportLeg.
 - cyCutOff: The deadline for cargo to be delivered to the Container Yard. It can be found at Cargo Cut Off or FCL delivery cut-off.
 
 - transportLegs: Multiple Transport Legs entries may exist, capture all instances under "transportLegs". Make sure the order of the legs are important.