Skip to content

Commit d175ccf

Browse files
committed
Bug/Fix ktools version
1 parent 428f638 commit d175ccf

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

src/model_execution_worker/utils.py

+14-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import logging
1616
import json
1717
import os
18+
import re
1819
import tempfile
1920
import shutil
2021
import subprocess
@@ -180,10 +181,22 @@ def get_oed_version():
180181
return None
181182

182183

184+
def get_ktools_version():
185+
ktool_ver_str = subprocess.getoutput('fmcalc -v')
186+
187+
# Match version x.x.x , x.x or x
188+
reg_pattern = "(\d+\.)?(\d+\.)?(\d+)"
189+
match_ver = re.search(reg_pattern, ktool_ver_str)
190+
191+
if match_ver:
192+
ktool_ver_str = match_ver[0]
193+
return ktool_ver_str
194+
195+
183196
def get_worker_versions():
184197
""" Search and return the versions of Oasis components
185198
"""
186-
ktool_ver_str = subprocess.getoutput('fmcalc -v')
199+
ktool_ver_str = get_ktools_version()
187200
plat_ver_file = '/home/worker/VERSION'
188201
oed_schma_ver = get_oed_version()
189202

0 commit comments

Comments
 (0)