Skip to content

Commit d324cba

Browse files
committed
removed debug logs, moved SQLAlchemy variables to Vease Back.
1 parent f967f9b commit d324cba

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

app.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,22 @@
2929
ORIGINS = app.config.get("ORIGINS")
3030
SSL = app.config.get("SSL")
3131

32+
33+
def get_db_path_from_config():
34+
database_uri = app.config.get("SQLALCHEMY_DATABASE_URI", "")
35+
if database_uri.startswith("sqlite:///"):
36+
return database_uri.replace("sqlite:///", "")
37+
return None
38+
39+
40+
db_path = get_db_path_from_config()
41+
if db_path:
42+
db_dir = os.path.dirname(db_path)
43+
if db_dir and not os.path.exists(db_dir):
44+
os.makedirs(db_dir, exist_ok=True)
45+
init_database(db_path)
46+
print(f"Database initialized at: {db_path}")
47+
3248
flask_cors.CORS(app, origins=ORIGINS)
3349
app.register_blueprint(
3450
blueprint_routes.routes,
@@ -56,18 +72,8 @@ def return_error():
5672
flask.abort(500, f"Test")
5773

5874

59-
def get_db_path_from_config():
60-
database_uri = app.config.get("SQLALCHEMY_DATABASE_URI", "")
61-
if database_uri.startswith("sqlite:///"):
62-
return database_uri.replace("sqlite:///", "")
63-
return None
64-
65-
6675
# ''' Main '''
6776
if __name__ == "__main__":
68-
db_path = get_db_path_from_config()
69-
if db_path:
70-
init_database(db_path)
71-
72-
print(f"Python is running in {FLASK_DEBUG} mode")
77+
data_folder = app.config.get("DATA_FOLDER_PATH")
78+
upload_folder = app.config.get("UPLOAD_FOLDER")
7379
app.run(debug=FLASK_DEBUG, host=DEFAULT_HOST, port=PORT, ssl_context=SSL)

src/opengeodeweb_back/app_config.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
# Third party imports
66
# Local application imports
77

8-
DATABASE_FILENAME = "project.db"
9-
108

119
class Config(object):
1210
FLASK_DEBUG = os.environ.get("FLASK_DEBUG", default=False)
@@ -18,6 +16,7 @@ class Config(object):
1816
LAST_REQUEST_TIME = time.time()
1917
LAST_PING_TIME = time.time()
2018
SQLALCHEMY_TRACK_MODIFICATIONS = False
19+
DATABASE_FILENAME = "project.db"
2120

2221

2322
class ProdConfig(Config):
@@ -26,9 +25,6 @@ class ProdConfig(Config):
2625
MINUTES_BEFORE_TIMEOUT = "1"
2726
SECONDS_BETWEEN_SHUTDOWNS = "10"
2827
DATA_FOLDER_PATH = "/data"
29-
SQLALCHEMY_DATABASE_URI = f"sqlite:///{os.path.abspath(
30-
os.path.join(DATA_FOLDER_PATH, DATABASE_FILENAME)
31-
)}"
3228

3329

3430
class DevConfig(Config):
@@ -38,6 +34,3 @@ class DevConfig(Config):
3834
SECONDS_BETWEEN_SHUTDOWNS = "10"
3935
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
4036
DATA_FOLDER_PATH = os.path.join(BASE_DIR, "data")
41-
SQLALCHEMY_DATABASE_URI = f"sqlite:///{os.path.join(
42-
BASE_DIR, DATA_FOLDER_PATH, DATABASE_FILENAME
43-
)}"

src/opengeodeweb_back/utils_functions.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ def validate_request(request: flask.Request, schema: dict[str, str]) -> None:
8787

8888
if json_data is None:
8989
json_data = {}
90-
9190
try:
9291
validate = fastjsonschema.compile(schema)
9392
validate(json_data)

0 commit comments

Comments
 (0)