Skip to content

Commit

Permalink
feat: rename ai4-cvat to ai4os-cvat for catalog consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
IgnacioHeredia committed Aug 27, 2024
1 parent 8be64db commit 9599f98
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ai4papi/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def load_yaml_conf(fpath):
# For tools, map the Nomad job name prefixes to tool IDs
tools_nomad2id = {
'fl': 'ai4os-federated-server',
'cvat': 'ai4-cvat',
'cvat': 'ai4os-cvat',
}
for tool in TOOLS.keys():
if tool not in tools_nomad2id.values():
Expand Down
6 changes: 3 additions & 3 deletions ai4papi/routers/v1/deployments/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def get_deployment(
job['tool_name'] = tool_id

# Additional checks
if tool_id == 'ai4-cvat':
if tool_id == 'ai4os-cvat':
# Remove useless endpoints (they all point to same url)
ignore = ['server', 'grafana']
job['active_endpoints'] = [k for k in job['active_endpoints'] if k not in ignore]
Expand Down Expand Up @@ -201,7 +201,7 @@ def create_deployment(

# Check if the provided configuration is within the job quotas
# Skip this check with CVAT because it does not have a "hardware" section in the conf
if tool_name not in ['ai4-cvat']:
if tool_name not in ['ai4os-cvat']:
quotas.check_jobwise(
conf=user_conf,
vo=vo,
Expand Down Expand Up @@ -300,7 +300,7 @@ def create_deployment(
usertask['Config']['args'] = [f'--{service}']

# Deploy a CVAT tool
elif tool_name == 'ai4-cvat':
elif tool_name == 'ai4os-cvat':

# Enforce defining CVAT username and password
cvat = {k: v for k, v in user_conf['general'].items() if k.startswith('cvat')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,14 @@ To avoid too much disruption, I'm only changing this inside the service field
To avoid too much disruption, I'm only changing this in the "main" task (parameter `image`)
- ${NOMAD_META_server_image}:${NOMAD_META_cvat_version}${NOMAD_META_cvat_version_custom} --> registry.services.ai4os.eu/ai4os/ai4-cvat-server:v2.7.3-AI4OS

[1]: https://github.com/ai4os/ai4-cvat/blob/v2.7.3-AI4OS/nomad/ai4-cvat.jobspec.nomad.hcl
[1]: https://github.com/ai4os/ai4os-cvat/blob/v2.7.3-AI4OS/nomad/ai4-cvat.jobspec.nomad.hcl
[2]: https://stackoverflow.com/a/56957750/18471590

Note:
In several part of the job we use the old name of the repo (ai4os/ai4-cvat) which
should redirect fine to the new repo name (ai4os/ai4os-cvat)
But it is important nevertheless to keep it in mind, just in case.

*/


Expand Down
File renamed without changes.

0 comments on commit 9599f98

Please sign in to comment.