Merge pull request #147 from paulsaxe/main

Fixed error uploading files for jobs.

devtools/conda-envs/test_env.yaml

@@ -5,10 +5,10 @@ dependencies:
   - pip
   - python<3.12
 
-  - connexion
+  - connexion<3.0
   - email-validator
   - fasteners
-  - flask>2.0
+  - flask<3.0
   - flask-authorize
   - flask-bootstrap
   - flask-cors
@@ -41,4 +41,5 @@ dependencies:
   - nodejs
   - twine
 
-
+  # - pip:
+  #     - connexion[flask,swagger-ui]

seamm_dashboard/__init__.py

@@ -150,13 +150,19 @@ def create_app(config_name=None):
 
     logger.info("")
 
-    logger.info(
-        "Running in "
-        + app.config["ENV"]
-        + " mode with database "
-        + app.config["SQLALCHEMY_DATABASE_URI"]
-    )
-
+    if "ENV" in app.config:
+        logger.info(
+            "Running in "
+            + app.config["ENV"]
+            + " mode with database "
+            + app.config["SQLALCHEMY_DATABASE_URI"]
+        )
+    else:
+        logger.info(
+            "Running with database "
+            + app.config["SQLALCHEMY_DATABASE_URI"]
+        )
+
     # Authorization configuration
     app.config["AUTHORIZE_DEFAULT_PERMISSIONS"] = dict(
         owner=["read", "update", "delete", "create", "manage"],

seamm_dashboard/routes/api/jobs.py

@@ -410,7 +410,15 @@ def add_file_to_job(body, id=None):
     -------
     The job id (integer)
     """
-    job_info, status = get_job(id)
+    response, status = get_job(id)
+    if status != 200:
+        return response
+
+    logger.debug(f"response from get_job: {type(response)}")
+    logger.debug(response)
+    job_info = response.get_json()
+    logger.debug(job_info)
+
     root = Path(job_info["path"])
 
     file_data = request.files["file"]