Skip to content

Commit f89b21c

Browse files
update: add scenari version to env variables so we do not need to write down scchainserver version number in code in order to import it
1 parent eb22589 commit f89b21c

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

app/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import os
21
from pydantic.v1 import BaseSettings
32

43

@@ -10,6 +9,7 @@ class Config(BaseSettings):
109
DOCUMENTATION_API_PUBLISH_LOCAL_PATH: str
1110
DOCUMENTATION_API_PUBLISH_LOCAL_BACKUP_PATH: str
1211
DOCUMENTATION_API_PUBLISH_API_KEY: str
12+
DOCUMENTATION_API_PUBLISH_SCENARI_VERSION: str
1313

1414
class Config:
1515
env_file = ".env"

app/utils/scenari_chain_server_portal.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
import os
22
from time import monotonic as timer
33
import time
4-
from app.config import config
54
import logging
6-
import scchainserver_6_4
5+
from app.config import config
76
import scenaripy_api as api
8-
from scchainserver_6_4 import portal
7+
import importlib
98

109
logger = logging.getLogger('uvicorn.error')
1110

11+
scchainserver = importlib.import_module(f"scchainserver_{config.DOCUMENTATION_API_PUBLISH_SCENARI_VERSION}")
12+
portal = importlib.import_module(f"scchainserver_{config.DOCUMENTATION_API_PUBLISH_SCENARI_VERSION}.portal")
13+
1214

1315
class ScenariChainServerPortal:
1416
def __init__(self, workshop_title):
1517
try:
16-
self.server = scchainserver_6_4.portal.new_portal(
18+
self.server = scchainserver.portal.new_portal(
1719
override_props={"user": config.DOCUMENTATION_API_PUBLISH_USER, "password": config.DOCUMENTATION_API_PUBLISH_PASSWORD})
1820
logger.info(f"Connexion au serveur scenari effectuée : {self.server}")
1921
logger.info(f"Recherche de l'atelier : {workshop_title}")
2022
self.wsp_code = api.search_wsp_code(self.server, title_fragment=workshop_title)
2123
logger.info(f"Code de l'atelier {workshop_title} : {self.wsp_code}")
2224
self.gen_path = config.DOCUMENTATION_API_PUBLISH_ZIP_PATH
2325
except Exception as e:
24-
logger.error(f"Erreur lors de l'appel au serveur scchainserver_6_4 : {e}")
26+
logger.error(f"Erreur lors de l'appel au serveur scchainserver : {e}")
2527
raise
2628

2729
def generate(self, pub_uri, generator_code):

0 commit comments

Comments
 (0)