From c11a8a51bc23fbe757050ad55a742488cd03ac20 Mon Sep 17 00:00:00 2001 From: Faysal Ishtiaq Date: Thu, 3 Mar 2022 12:35:06 +0600 Subject: [PATCH] fix climsoft file upload --- .gitignore | 2 +- requirements.txt | 2 +- src/opencdms_api/main.py | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8e3d541..46e3472 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ __pycache__/ *.py[cod] *$py.class - +climsoft_uploads/ # C extensions *.so diff --git a/requirements.txt b/requirements.txt index 58a2850..90d140a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,9 +6,9 @@ django-colorfield djantic email-validator Faker +Flask fastapi FastAPI-SQLAlchemy -Flask Flask-MySQLdb Flask-RESTful mch-api @ git+https://github.com/opencdms/mch-api.git@main diff --git a/src/opencdms_api/main.py b/src/opencdms_api/main.py index 180485a..b62aae4 100644 --- a/src/opencdms_api/main.py +++ b/src/opencdms_api/main.py @@ -4,6 +4,7 @@ from sqlalchemy import create_engine from starlette.middleware.wsgi import WSGIMiddleware from climsoft_api.main import get_app as get_climsoft_app +from climsoft_api.config import settings as climsoft_settings from tempestas_api.wsgi import application as surface_application from mch_api.api_mch import app as mch_api_application from fastapi import FastAPI, Request @@ -90,7 +91,9 @@ def create_default_user(): ClimsoftSessionLocal = sessionmaker(climsoft_engine) session = ClimsoftSessionLocal() try: - clim_user_role = session.query(climsoft_models.ClimsoftUser).filter_by( + clim_user_role = session.query( + climsoft_models.ClimsoftUser + ).filter_by( userName=settings.DEFAULT_USERNAME ).one_or_none()