Skip to content

Commit 428f638

Browse files
committed
Add server components version info
1 parent b1018e9 commit 428f638

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

src/server/oasisapi/info/views.py

+14-7
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
from rest_framework.response import Response
55
from .peril import PERIL_GROUPS, PERILS
66
from ..schemas.custom_swagger import SERVER_INFO
7-
# from ....model_execution_worker.utils import get_worker_version
87
import logging
98

9+
from ods_tools import __version__ as ods_version
10+
1011

1112
class PerilcodesView(views.APIView):
1213
"""
@@ -39,8 +40,6 @@ class ServerInfoView(views.APIView):
3940

4041
@swagger_auto_schema(responses={200: SERVER_INFO}, tags=['info'])
4142
def get(self, request):
42-
from celery.contrib import rdb
43-
rdb.set_trace()
4443
server_version = ""
4544
server_config = dict()
4645

@@ -79,12 +78,20 @@ def get(self, request):
7978
server_config['ACCESS_TOKEN_LIFETIME'] = settings.SIMPLE_JWT['ACCESS_TOKEN_LIFETIME']
8079
server_config['REFRESH_TOKEN_LIFETIME'] = settings.SIMPLE_JWT['REFRESH_TOKEN_LIFETIME']
8180

82-
# Worker information
83-
worker_config = {}
84-
# worker_config = get_worker_version()
81+
# Components information
82+
components_config = {
83+
'ods_version': ods_version,
84+
}
85+
86+
try:
87+
from ods_tools.oed.oed_schema import OedSchema
88+
OedSchemaData = OedSchema.from_oed_schema_info(oed_schema_info=None)
89+
components_config['oed_version'] = OedSchemaData.schema['version']
90+
except Exception as _:
91+
logging.exception("Failed to get OED version info")
8592

8693
return Response({
8794
'version': server_version,
8895
'config': server_config,
89-
'components': worker_config
96+
'components': components_config,
9097
})

src/server/oasisapi/schemas/custom_swagger.py

+5
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@
5151
title='Server config',
5252
description="Oasis server public configuration",
5353
type='object',
54+
),
55+
"components": Schema(
56+
title='Components version',
57+
description="Versions of oasis components",
58+
type='object',
5459
)
5560
}
5661
)

0 commit comments

Comments
 (0)