Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions ARGO/oceancurrent/oceancurrent_file_server_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,38 @@ def _load_api_endpoint():
"filetype": ".gif",
"region_layer": 3,
"max_layer": 3
},
{
"productId": "fishSOOP-profiles",
"include": [
{"path": "^fishsoop$", "layer": 1},
{"path": "^(Darwin|Kimberley|NWS|SharkBay|Perth|AlbEsp|RechEyre|SAgulfs|BassStr|TasW|TasE|SNSW|NNSW|SGBR|CGBR|NGBR|GOC|Au)$", "layer": 2},
Comment thread
weited marked this conversation as resolved.
{"path": "^\\d{4}$", "layer": 3}
],
"filetype": ".gif",
"region_layer": 2,
"max_layer": 3,
"save_in_product_folder": True
},
{
"productId": "fishSOOP-quarterlyAnomalies",
"include": [
{"path": "^fishsoop$", "layer": 1},
{"path": "^anom2$", "layer": 2}
],
"filetype": ".gif",
"max_layer": 2,
"save_in_product_folder": True
},
{
"productId": "fishSOOP-depthAnomalies",
"include": [
{"path": "^fishsoop$", "layer": 1},
{"path": "^anom$", "layer": 2}
],
"filetype": ".gif",
"max_layer": 2,
"save_in_product_folder": True
}
]

Expand Down
60 changes: 60 additions & 0 deletions ARGO/oceancurrent/test_oceancurrent_file_server_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,59 @@ def prepare_test_cases(self):
]
}
],
"fishSOOP-profiles": [
{
"path": "/fishsoop/Au/2026",
"productId": "fishSOOP-profiles",
"region": "Au",
"depth": None,
"files": [
{
"name": "20260609.gif"
}
]
},
{
"path": "/fishsoop/TasE/2026",
"productId": "fishSOOP-profiles",
"region": "TasE",
"depth": None,
"files": [
{
"name": "20260609.gif"
}
]
}
],
"fishSOOP-quarterlyAnomalies": [
{
"path": "/fishsoop/anom2",
"productId": "fishSOOP-quarterlyAnomalies",
"region": None,
"depth": None,
"files": [
{
"name": "tanom_reg11_TasE_2025Q2_layer3.gif"
},
{
"name": "tanom_avg_p1.gif"
}
]
}
],
"fishSOOP-depthAnomalies": [
{
"path": "/fishsoop/anom",
"productId": "fishSOOP-depthAnomalies",
"region": None,
"depth": None,
"files": [
{
"name": "tanom_reg18_Au_layer8.gif"
}
]
}
],
}

def load_and_normalize_json(self, file_path):
Expand Down Expand Up @@ -518,6 +571,13 @@ def test_file_structure_explorer(self):
self.verify_json("tidalCurrents-monthplots", "tides", "tidalCurrents-monthplots")
self.verify_json("EACMooringArray", "EAC_array_figures", "EACMooringArray")
self.verify_json("swotGsla-ssh", "DR_SWOT/SSH", "SSH")
self.verify_json("fishSOOP-profiles", "fishsoop", "fishSOOP-profiles")
self.verify_json("fishSOOP-quarterlyAnomalies", "fishsoop", "fishSOOP-quarterlyAnomalies")
self.verify_json("fishSOOP-depthAnomalies", "fishsoop", "fishSOOP-depthAnomalies")
# Verify the fishsoop finder maps folder is excluded by the region whitelist
fishsoop_json_path = os.path.join(self.file_test_dir, "fishsoop", "fishSOOP-profiles.json")
fishsoop_regions = {item["region"] for item in self.load_and_normalize_json(fishsoop_json_path)}
self.assertNotIn("maps", fishsoop_regions, "Navigation folder 'maps' should not be indexed")
# Verify unrelated directories under DR_SWOT/SSH are excluded by the region whitelist
swot_json_path = os.path.join(self.file_test_dir, "DR_SWOT", "SSH", "SSH.json")
swot_regions = {item["region"] for item in self.load_and_normalize_json(swot_json_path)}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading