Skip to content

Commit 36935cf

Browse files
committed
update
1 parent f19134b commit 36935cf

File tree

4 files changed

+7
-23
lines changed

4 files changed

+7
-23
lines changed

src/opengeodeweb_back/routes/blueprint_routes.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# Third party imports
66
import flask
77
import werkzeug
8+
from opengeodeweb_microservice.schemas import get_schemas_dict
89

910
# Local application imports
1011
from opengeodeweb_back import geode_functions, utils_functions
@@ -20,9 +21,7 @@
2021
name=blueprint_models.routes.name,
2122
)
2223

23-
schemas_dict = utils_functions.get_schemas_dict(
24-
os.path.join(os.path.dirname(__file__), "schemas")
25-
)
24+
schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
2625

2726

2827
@routes.route(

src/opengeodeweb_back/routes/create/blueprint_create.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Third party imports
55
import flask
66
import opengeode
7+
from opengeodeweb_microservice.schemas import get_schemas_dict
78

89
# Local application imports
910
from opengeodeweb_back import geode_functions, utils_functions
1011
from . import schemas
1112

1213
routes = flask.Blueprint("create", __name__, url_prefix="/create")
13-
schemas_dict = utils_functions.get_schemas_dict(
14-
os.path.join(os.path.dirname(__file__), "schemas")
15-
)
14+
schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
1615

1716

1817
@routes.route(

src/opengeodeweb_back/routes/models/blueprint_models.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
import os
22
import xml.etree.ElementTree as ET
33
import flask
4+
from opengeodeweb_microservice.schemas import get_schemas_dict
45

56
from opengeodeweb_back import geode_functions, utils_functions
67
from . import schemas
78

89
routes = flask.Blueprint("models", __name__, url_prefix="/models")
9-
schemas_dict = utils_functions.get_schemas_dict(
10-
os.path.join(os.path.dirname(__file__), "schemas")
11-
)
10+
schemas_dict = get_schemas_dict(os.path.join(os.path.dirname(__file__), "schemas"))
1211

1312

1413
@routes.route(

src/opengeodeweb_back/utils_functions.py

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# Standard library imports
22
import os
3-
import glob
4-
import json
53
import threading
64
import time
75
import zipfile
@@ -18,21 +16,10 @@
1816

1917
# Local application imports
2018
from . import geode_functions
19+
from opengeodeweb_microservice.schemas import SchemaDict
2120
from opengeodeweb_microservice.database.data import Data
2221
from opengeodeweb_microservice.database.connection import get_session
2322

24-
type SchemaDict = dict[str, str]
25-
26-
27-
def get_schemas_dict(path: str) -> dict[str, SchemaDict]:
28-
schemas_dict: dict[str, SchemaDict] = {}
29-
for json_file in glob.glob(os.path.join(path, "*.json")):
30-
filename = os.path.basename(json_file)
31-
with open(os.path.join(path, json_file), "r") as file:
32-
file_content = json.load(file)
33-
schemas_dict[os.path.splitext(filename)[0]] = file_content
34-
return schemas_dict
35-
3623

3724
def increment_request_counter(current_app: flask.Flask) -> None:
3825
if "REQUEST_COUNTER" in current_app.config:

0 commit comments

Comments
 (0)