Skip to content

chore: remove deprecated keys #555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SeanBarry wants to merge 6 commits into
base: master
Choose a base branch
from
Open

chore: remove deprecated keys #555

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
648012d
chore: remove deprecated keys
SeanBarry Dec 22, 2025
0087bbb
fix: remove deprecated fields from test data
SeanBarry Dec 22, 2025
c5747ce
fix: remove deprecated fields from example data
SeanBarry Dec 22, 2025
b402e28
fix: remove deprecated fields from doc strings
SeanBarry Dec 22, 2025
2413c5c
fix: remove deprecated fields from vessel entity
SeanBarry Dec 22, 2025
42b8105
fix: remove deprecated fields from fixtures
SeanBarry Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
228 changes: 112 additions & 116 deletions tests/api/examples/cargo_movements.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,118 +1,114 @@
[
{
"cargo_movement_id": "00886b05a0747522b67322f50123ee60e61e219fc9a9c6011be1a1dade65f63e",
"quantity": 4401,
"status": "unloaded_state",
"vessels": [
{
"id": "9cbf7c0fc6ccf1dfeacde02b87f3b6b1653030f560d4fc677bf1d7d0be8f8449",
"mmsi": 255804460,
"imo": 9480980,
"name": "JOHANN ESSBERGER",
"dwt": 5260,
"cubic_capacity": 6100,
"vessel_class": "tiny_tanker",
"classes": [
{
"id": "vlcc_plus",
"label": "VLCC+",
"layer": "legacy"
},
{
"id": "oil",
"label": "Oil Tankers",
"layer": "group"
},
{
"id": "oil_vlcc",
"label": "VLCC+",
"layer": "coarse"
},
{
"id": "oil_vlcc",
"label": "VLCC+",
"layer": "granular"
}
],
"corporate_entities": [
{
"id": "f9bd45e65e292909a7b751b0026dcf7795c6194b3c0712910a241caee32c99b8",
"label": "Essberger J.T.",
"layer": "effective_controller",
"probability": 1,
"source": "external"
}
],
"start_timestamp": "2019-10-18T21:38:34+0000",
"end_timestamp": "2019-10-25T00:40:46+0000",
"fixture_fulfilled": false,
"voyage_id": "401f0e74fc42401248a484aca2e9955dea885378796f7f4d0bc8e92c35ea270a",
"tags": [],
"status": "vessel_status_laden_known"
}
],
"product": [
{
"id": "b68cbb746f8b9098c50e2ba36bcad83001a53bd362e9031fb49085d02c36659c",
"layer": "group",
"probability": 0.4756425,
"source": "model",
"label": "Clean products"
},
{
"id": "a75fcc09bfc7d16496de3336551bc52b5891838bb7c22356d2cb65451587d1e5",
"layer": "group_product",
"probability": 0.4756425,
"source": "model",
"label": "Biodiesel"
},
{
"id": "9d52ede1cff0421a8cd7283b0171afe8d23f519dca5f4e489734522f9cdf804c",
"layer": "grade",
"probability": 0.4756425,
"source": "model",
"label": "Biodiesel Feedstock"
}
],
"events": [
{
"event_type": "cargo_port_load_event",
"location": [
{
"id": "2dfc3d43a21697c02ec3b2700b3b570a6ed1abb66d01c4fe6310ef362fcf6653",
"layer": "country",
"label": "Netherlands",
"source": "model",
"probability": 1
}
],
"vessel_id": "9cbf7c0fc6ccf1dfeacde02b87f3b6b1653030f560d4fc677bf1d7d0be8f8449",
"probability": 1,
"pos": [
4.29914090037834,
51.87936163368058
],
"start_timestamp": "2019-10-18T21:38:34+0000",
"end_timestamp": "2019-10-20T16:41:49+0000"
}
],
"parent_ids": [
{
"id": "9d52ede1cff0421a8cd7283b0171afe8d23f519dca5f4e489734522f9cdf804c",
"splinter_timestamp": "2019-10-20T16:41:49+0000"
}
],
"trades": [
{
"type": "shipper",
"id": "c9f70607e743e82428ea24cd32f6e403c6ced09078eacfe3d6c175347a9ab508",
"label": "NAYARA ENERGY"
},
{
"type": "consignee",
"id": "5b3fcbc1bd2efec8999bd37d128a7e2132ebd9acf5a1a6fd8d6d2ba234c13938",
"label": "RELIANCE"
}
]
}
{
"cargo_movement_id": "00886b05a0747522b67322f50123ee60e61e219fc9a9c6011be1a1dade65f63e",
"quantity": 4401,
"status": "unloaded_state",
"vessels": [
{
"id": "9cbf7c0fc6ccf1dfeacde02b87f3b6b1653030f560d4fc677bf1d7d0be8f8449",
"mmsi": 255804460,
"imo": 9480980,
"name": "JOHANN ESSBERGER",
"dwt": 5260,
"cubic_capacity": 6100,
"vessel_class": "tiny_tanker",
"classes": [
{
"id": "vlcc_plus",
"label": "VLCC+",
"layer": "legacy"
},
{
"id": "oil",
"label": "Oil Tankers",
"layer": "group"
},
{
"id": "oil_vlcc",
"label": "VLCC+",
"layer": "coarse"
},
{
"id": "oil_vlcc",
"label": "VLCC+",
"layer": "granular"
}
],
"corporate_entities": [
{
"id": "f9bd45e65e292909a7b751b0026dcf7795c6194b3c0712910a241caee32c99b8",
"label": "Essberger J.T.",
"layer": "effective_controller",
"probability": 1,
"source": "external"
}
],
"start_timestamp": "2019-10-18T21:38:34+0000",
"end_timestamp": "2019-10-25T00:40:46+0000",
"voyage_id": "401f0e74fc42401248a484aca2e9955dea885378796f7f4d0bc8e92c35ea270a",
"tags": [],
"status": "vessel_status_laden_known"
}
],
"product": [
{
"id": "b68cbb746f8b9098c50e2ba36bcad83001a53bd362e9031fb49085d02c36659c",
"layer": "group",
"probability": 0.4756425,
"source": "model",
"label": "Clean products"
},
{
"id": "a75fcc09bfc7d16496de3336551bc52b5891838bb7c22356d2cb65451587d1e5",
"layer": "group_product",
"probability": 0.4756425,
"source": "model",
"label": "Biodiesel"
},
{
"id": "9d52ede1cff0421a8cd7283b0171afe8d23f519dca5f4e489734522f9cdf804c",
"layer": "grade",
"probability": 0.4756425,
"source": "model",
"label": "Biodiesel Feedstock"
}
],
"events": [
{
"event_type": "cargo_port_load_event",
"location": [
{
"id": "2dfc3d43a21697c02ec3b2700b3b570a6ed1abb66d01c4fe6310ef362fcf6653",
"layer": "country",
"label": "Netherlands",
"source": "model",
"probability": 1
}
],
"vessel_id": "9cbf7c0fc6ccf1dfeacde02b87f3b6b1653030f560d4fc677bf1d7d0be8f8449",
"probability": 1,
"pos": [4.29914090037834, 51.87936163368058],
"start_timestamp": "2019-10-18T21:38:34+0000",
"end_timestamp": "2019-10-20T16:41:49+0000"
}
],
"parent_ids": [
{
"id": "9d52ede1cff0421a8cd7283b0171afe8d23f519dca5f4e489734522f9cdf804c",
"splinter_timestamp": "2019-10-20T16:41:49+0000"
}
],
"trades": [
{
"type": "shipper",
"id": "c9f70607e743e82428ea24cd32f6e403c6ced09078eacfe3d6c175347a9ab508",
"label": "NAYARA ENERGY"
},
{
"type": "consignee",
"id": "5b3fcbc1bd2efec8999bd37d128a7e2132ebd9acf5a1a6fd8d6d2ba234c13938",
"label": "RELIANCE"
}
]
}
]
3 changes: 0 additions & 3 deletions tests/api/test_cargo_movement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class TestCargoMovement(TestCase):
],
"start_timestamp": "2019-10-18T21:38:34+0000",
"end_timestamp": "2019-10-25T00:40:46+0000",
"fixture_fulfilled": False,
"voyage_id": "401f0e74fc42401248a484aca2e9955dea885378796f7f4d0bc8e92c35ea270a",
"tags": [],
"status": "vessel_status_laden_known",
Expand Down Expand Up @@ -161,8 +160,6 @@ def test_convert_to_flat_dict(self) -> None:
"vessels.0.corporate_entities.effective_controller.end_timestamp": None,
"vessels.0.cubic_capacity": 6100,
"vessels.0.end_timestamp": "2019-10-25T00:40:46+0000",
"vessels.0.fixture_fulfilled": False,
"vessels.0.fixture_id": None,
"vessels.0.id": "9cbf7c0fc6ccf1dfeacde02b87f3b6b1653030f560d4fc677bf1d7d0be8f8449",
"vessels.0.imo": 9480980,
"vessels.0.mmsi": 255804460,
Expand Down
2 changes: 0 additions & 2 deletions tests/api/test_vessel_entity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ def test_serialize(self) -> None:
},
],
"start_timestamp": "2019-10-14T00:00:00+0000",
"fixture_id": "cc4f364367db830da1d5d8ad89b02a7dc6f207402cd907a19c9d713e1a70b0ed",
"fixture_fulfilled": False,
"voyage_id": "813cb0baf01a335a5c74aded99b5c910bf627b24ff7b5eb9ed943579e902495d",
"tags": [],
"status": "vessel_status_laden_known",
Expand Down
2 changes: 0 additions & 2 deletions vortexasdk/api/vessel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,7 @@ class VesselEntity(IDName):

cubic_capacity: Optional[int] = None
voyage_id: Optional[str] = None
fixture_fulfilled: Optional[bool] = None
end_timestamp: Optional[ISODate] = None
fixture_id: Optional[str] = None

scrubber: Optional[List[Scrubber]] = None
flag: Optional[List[Flag]] = None
Expand Down
3 changes: 0 additions & 3 deletions vortexasdk/endpoints/cargo_movements_result.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,6 @@ def to_df(
'vessels.0.cubic_capacity',
'vessels.0.dwt',
'vessels.0.end_timestamp',
'vessels.0.fixture_fulfilled',
'vessels.0.fixture_id',
'vessels.0.id',
'vessels.0.imo',
'vessels.0.mmsi',
Expand Down Expand Up @@ -492,7 +490,6 @@ def to_df(
'vessels.1.cubic_capacity',
'vessels.1.dwt',
'vessels.1.end_timestamp',
'vessels.1.fixture_fulfilled',
'vessels.1.id',
'vessels.1.imo',
'vessels.1.mmsi',
Expand Down
2 changes: 0 additions & 2 deletions vortexasdk/endpoints/fixtures_result.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ def to_df(
'vessels.cubic_capacity',
'vessels.dwt',
'vessels.end_timestamp',
'vessels.fixture_fulfilled',
'vessels.fixture_id',
'vessels.id',
'vessels.imo',
'vessels.mmsi',
Expand Down
Loading