Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arkindex
Backend
Commits
a59182f7
Commit
a59182f7
authored
1 week ago
by
Valentin Rigal
Committed by
Erwan Rouchet
1 week ago
Browse files
Options
Downloads
Patches
Plain Diff
Define WorkerVersion tags from their Docker images
parent
90d5b948
No related branches found
No related tags found
1 merge request
!2542
Define WorkerVersion tags from their Docker images
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
arkindex/process/serializers/workers.py
+13
-0
13 additions, 0 deletions
arkindex/process/serializers/workers.py
arkindex/process/tests/worker_versions/test_create.py
+87
-0
87 additions, 0 deletions
arkindex/process/tests/worker_versions/test_create.py
with
100 additions
and
0 deletions
arkindex/process/serializers/workers.py
+
13
−
0
View file @
a59182f7
...
...
@@ -29,6 +29,8 @@ from arkindex.users.models import Role
from
docker.auth
import
resolve_repository_name
from
docker.errors
import
InvalidRepository
from
docker.utils
import
parse_repository_tag
from
packaging.version
import
InvalidVersion
from
packaging.version
import
parse
as
parse_version
class
ExistingWorkerException
(
Exception
):
...
...
@@ -371,6 +373,17 @@ class WorkerVersionCreateSerializer(WorkerVersionSerializer):
last_version
=
worker
.
versions
.
using
(
"
default
"
).
aggregate
(
last_version
=
Max
(
"
version
"
))[
"
last_version
"
]
data
[
"
version
"
]
=
last_version
+
1
if
last_version
else
1
# Try to autodetect the tag from the docker image
if
"
tag
"
not
in
data
and
"
docker_image_iid
"
in
data
:
_
,
tag
=
parse_repository_tag
(
data
[
"
docker_image_iid
"
])
if
tag
is
not
None
:
try
:
parse_version
(
tag
)
except
InvalidVersion
:
pass
else
:
data
[
"
tag
"
]
=
tag
data
[
"
worker_id
"
]
=
worker
.
id
return
data
...
...
This diff is collapsed.
Click to expand it.
arkindex/process/tests/worker_versions/test_create.py
+
87
−
0
View file @
a59182f7
...
...
@@ -660,3 +660,90 @@ class TestWorkerVersionCreate(FixtureAPITestCase):
},
}
})
def
test_docker_image_iid
(
self
):
with
self
.
assertNumQueries
(
6
):
response
=
self
.
client
.
post
(
reverse
(
"
api:worker-versions
"
,
kwargs
=
{
"
pk
"
:
str
(
self
.
worker_reco
.
id
)}),
data
=
{
"
docker_image_iid
"
:
"
registry.dev.test/workers/test:0001.0.0rc1
"
,
"
revision_url
"
:
"
https://dev.test/some/commit/aaaa
"
,
"
configuration
"
:
{
"
test
"
:
42
},
"
state
"
:
"
available
"
,
},
HTTP_AUTHORIZATION
=
f
"
Ponos
{
self
.
task
.
token
}
"
,
)
self
.
assertEqual
(
response
.
status_code
,
status
.
HTTP_201_CREATED
)
data
=
response
.
json
()
worker_version
=
WorkerVersion
.
objects
.
get
(
id
=
data
[
"
id
"
])
self
.
assertDictEqual
(
data
,
{
"
branch
"
:
None
,
"
configuration
"
:
{
"
test
"
:
42
},
"
created
"
:
worker_version
.
created
.
isoformat
().
replace
(
"
+00:00
"
,
"
Z
"
),
"
docker_image_iid
"
:
"
registry.dev.test/workers/test:0001.0.0rc1
"
,
"
gpu_usage
"
:
"
disabled
"
,
"
id
"
:
str
(
worker_version
.
id
),
"
model_usage
"
:
"
disabled
"
,
"
revision_url
"
:
"
https://dev.test/some/commit/aaaa
"
,
"
state
"
:
"
available
"
,
# Tag is automatically detected from the docker image
"
tag
"
:
"
0001.0.0rc1
"
,
"
version
"
:
None
,
"
worker
"
:
{
"
archived
"
:
False
,
"
cost_1k_elements
"
:
"
0.250
"
,
"
cost_cpu_hour
"
:
"
1.312
"
,
"
cost_gpu_hour
"
:
"
0.000
"
,
"
description
"
:
""
,
"
id
"
:
str
(
worker_version
.
worker_id
),
"
name
"
:
"
Recognizer
"
,
"
repository_url
"
:
None
,
"
slug
"
:
"
reco
"
,
"
type
"
:
"
recognizer
"
,
}
})
def
test_docker_image_iid_tag_override
(
self
):
with
self
.
assertNumQueries
(
6
):
response
=
self
.
client
.
post
(
reverse
(
"
api:worker-versions
"
,
kwargs
=
{
"
pk
"
:
str
(
self
.
worker_reco
.
id
)}),
data
=
{
"
docker_image_iid
"
:
"
registry.dev.test/workers/test:0001.0.0rc1
"
,
"
tag
"
:
None
,
"
revision_url
"
:
"
https://dev.test/some/commit/aaaa
"
,
"
configuration
"
:
{
"
test
"
:
42
},
"
state
"
:
"
available
"
,
},
HTTP_AUTHORIZATION
=
f
"
Ponos
{
self
.
task
.
token
}
"
,
)
self
.
assertEqual
(
response
.
status_code
,
status
.
HTTP_201_CREATED
)
data
=
response
.
json
()
worker_version
=
WorkerVersion
.
objects
.
get
(
id
=
data
[
"
id
"
])
self
.
assertDictEqual
(
data
,
{
"
branch
"
:
None
,
"
configuration
"
:
{
"
test
"
:
42
},
"
created
"
:
worker_version
.
created
.
isoformat
().
replace
(
"
+00:00
"
,
"
Z
"
),
"
docker_image_iid
"
:
"
registry.dev.test/workers/test:0001.0.0rc1
"
,
"
gpu_usage
"
:
"
disabled
"
,
"
id
"
:
str
(
worker_version
.
id
),
"
model_usage
"
:
"
disabled
"
,
"
revision_url
"
:
"
https://dev.test/some/commit/aaaa
"
,
"
state
"
:
"
available
"
,
# Tag is not automatically detected from the docker image
"
tag
"
:
None
,
"
version
"
:
None
,
"
worker
"
:
{
"
archived
"
:
False
,
"
cost_1k_elements
"
:
"
0.250
"
,
"
cost_cpu_hour
"
:
"
1.312
"
,
"
cost_gpu_hour
"
:
"
0.000
"
,
"
description
"
:
""
,
"
id
"
:
str
(
worker_version
.
worker_id
),
"
name
"
:
"
Recognizer
"
,
"
repository_url
"
:
None
,
"
slug
"
:
"
reco
"
,
"
type
"
:
"
recognizer
"
,
}
})
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment