feat: Changed operations to return a JSONResponse

GermanMT · GermanMT · commit 27d2d34abe50 · 2025-08-14T10:28:12.000+02:00
diff --git a/app/controllers/config_operation_controller.py b/app/controllers/config_operation_controller.py
@@ -51,15 +51,7 @@ async def valid_config(
             model_text = await smt_model.transform()
             await replace_smt_text(smt_text_id, model_text)
         config = await read_serial_numbers_by_releases(valid_config_request.node_type.value, valid_config_request.config)
-        result = await execute_valid_config(smt_model, config)
-        return JSONResponse(
-            status_code=status.HTTP_200_OK, content=json_encoder(
-                {
-                    "result": result,
-                    "code": "valid_config_success",
-                }
-            )
-        )
+        return await execute_valid_config(smt_model, config)
     else:
         return JSONResponse(
             status_code=status.HTTP_200_OK,
@@ -95,15 +87,7 @@ async def complete_config(
             model_text = await smt_model.transform()
             await replace_smt_text(smt_text_id, model_text)
         config = await read_serial_numbers_by_releases(complete_config_request.node_type.value, complete_config_request.config)
-        result = await execute_complete_config(smt_model, config)
-        return JSONResponse(
-            status_code=status.HTTP_200_OK, content=json_encoder(
-                {
-                    "result": result,
-                    "code": "complete_config_success",
-                }
-            )
-        )
+        return await execute_complete_config(smt_model, config)
     else:
         return JSONResponse(
             status_code=status.HTTP_200_OK,
@@ -138,15 +122,7 @@ async def config_by_impact(
         else:
             model_text = await smt_model.transform()
             await replace_smt_text(smt_text_id, model_text)
-        result = execute_config_by_impact(smt_model, config_by_impact_request.impact)
-        return JSONResponse(
-            status_code=status.HTTP_200_OK, content=json_encoder(
-                {
-                    "result": result,
-                    "code": "config_by_impact_success",
-                }
-            )
-        )
+        return execute_config_by_impact(smt_model, config_by_impact_request.impact)
     else:
         return JSONResponse(
             status_code=status.HTTP_200_OK,
diff --git a/app/controllers/file_operation_controller.py b/app/controllers/file_operation_controller.py
@@ -57,25 +57,37 @@ async def requirement_file_info(
             file_info_request.requirement_file_id,
             file_info_request.max_level
         )
-        for direct_package in result["direct_dependencies"]:
-            direct_package["versions"] = await filter_versions(
-                file_info_request.node_type.value,
-                direct_package["versions"],
-                direct_package["package_constraints"]
-            )
-        for _, indirect_packages in result["indirect_dependencies_by_depth"].items():
-            for indirect_package in indirect_packages:
-                indirect_package["versions"] = await filter_versions(
+        if operation_result["total_direct_dependencies"] == 0:
+            for direct_package in result["direct_dependencies"]:
+                direct_package["versions"] = await filter_versions(
                     file_info_request.node_type.value,
-                    indirect_package["versions"],
-                    indirect_package["package_constraints"]
+                    direct_package["versions"],
+                    direct_package["package_constraints"]
                 )
+            for _, indirect_packages in result["indirect_dependencies_by_depth"].items():
+                for indirect_package in indirect_packages:
+                    indirect_package["versions"] = await filter_versions(
+                        file_info_request.node_type.value,
+                        indirect_package["versions"],
+                        indirect_package["package_constraints"]
+                    )
+        else:
+            return JSONResponse(
+                status_code=status.HTTP_200_OK,
+                content=json_encoder(
+                    {
+                        "code": "no_dependencies",
+                    }
+                ),
+            )
         await replace_operation_result(operation_result_id, result)
     return JSONResponse(
-        status_code=status.HTTP_200_OK, content=json_encoder({
-            "result": result,
-            "code": "file_info_success",
-        })
+        status_code=status.HTTP_200_OK, content=json_encoder(
+            {
+                "result": result,
+                "code": "file_info_success",
+            }
+        )
     )
 
 
@@ -102,16 +114,10 @@ async def valid_graph(
         else:
             model_text = await smt_model.transform()
             await replace_smt_text(smt_text_id, model_text)
-        result = execute_valid_graph(smt_model)
-        return JSONResponse(
-            status_code=status.HTTP_200_OK, content=json_encoder({
-                "result": result,
-                "code": "valid_graph_success",
-            })
-        )
+        return execute_valid_graph(smt_model)
     else:
         return JSONResponse(
-            status_code=status.HTTP_400_BAD_REQUEST,
+            status_code=status.HTTP_200_OK,
             content=json_encoder(
                 {
                     "code": "no_dependencies",
@@ -143,18 +149,10 @@ async def minimize_impact(
         else:
             model_text = await smt_model.transform()
             await replace_smt_text(smt_text_id, model_text)
-        result = await execute_minimize_impact(smt_model, min_max_impact_request.limit)
-        return JSONResponse(
-            status_code=status.HTTP_200_OK, content=json_encoder(
-                {
-                    "result": result,
-                    "code": "minimize_impact_success",
-                }
-            )
-        )
+        return await execute_minimize_impact(smt_model, min_max_impact_request.limit)
     else:
         return JSONResponse(
-            status_code=status.HTTP_400_BAD_REQUEST,
+            status_code=status.HTTP_200_OK,
             content=json_encoder(
                 {
                     "code": "no_dependencies",
@@ -186,18 +184,10 @@ async def maximize_impact(
         else:
             model_text = await smt_model.transform()
             await replace_smt_text(smt_text_id, model_text)
-        result = await execute_maximize_impact(smt_model, min_max_impact_request.limit)
-        return JSONResponse(
-            status_code=status.HTTP_200_OK, content=json_encoder(
-                {
-                    "result": result,
-                    "code": "maximize_impact_success"
-                }
-            )
-        )
+        return await execute_maximize_impact(smt_model, min_max_impact_request.limit)
     else:
         return JSONResponse(
-            status_code=status.HTTP_400_BAD_REQUEST,
+            status_code=status.HTTP_200_OK,
             content=json_encoder(
                 {
                     "code": "no_dependencies",
@@ -229,18 +219,10 @@ async def filter_configs(
         else:
             model_text = await smt_model.transform()
             await replace_smt_text(smt_text_id, model_text)
-        result = await execute_filter_configs(smt_model, filter_configs_request.max_threshold, filter_configs_request.min_threshold, filter_configs_request.limit)
-        return JSONResponse(
-            status_code=status.HTTP_200_OK, content=json_encoder(
-                {
-                    "result": result,
-                    "code": "filter_configs_success",
-                }
-            )
-        )
+        return await execute_filter_configs(smt_model, filter_configs_request.max_threshold, filter_configs_request.min_threshold, filter_configs_request.limit)
     else:
         return JSONResponse(
-            status_code=status.HTTP_400_BAD_REQUEST,
+            status_code=status.HTTP_200_OK,
             content=json_encoder(
                 {
                     "code": "no_dependencies",
diff --git a/app/utils/smt/operations/complete_config.py b/app/utils/smt/operations/complete_config.py
@@ -1,10 +1,14 @@
 from z3 import Int, Optimize, sat, unknown
 
+from fastapi import status
+from fastapi.responses import JSONResponse
+
 from app.utils.smt.config_sanitizer import config_sanitizer
 from app.utils.smt.model import SMTModel
+from app.utils import json_encoder
 
 
-async def execute_complete_config(model: SMTModel, config: dict[str, int]) -> list[dict[str, float | int]] | str:
+async def execute_complete_config(model: SMTModel, config: dict[str, int]) -> JSONResponse:
     solver = Optimize()
     solver.set("timeout", 3000)
     result = []
@@ -14,13 +18,19 @@ async def execute_complete_config(model: SMTModel, config: dict[str, int]) -> li
     solver.add(model.domain)
     for package, serial_number in config.items():
         solver.add(Int(package) == serial_number)
-    while solver.check() == sat:
+    if solver.check() == sat:
         config = solver.model()
         sanitized_config = await config_sanitizer(model.node_type, config)
         result.append(sanitized_config)
-        break
-    if solver.check() == unknown:
-        result = (
-            "Execution timed out after 3 seconds. The complexity of the model is too high, try lowering the maximum level of the graph."
+        code = "operation_success"
+    elif solver.check() == unknown:
+        result = ""
+        code = "smt_timeout"
+    return JSONResponse(
+        status_code=status.HTTP_200_OK, content=json_encoder(
+            {
+                "result": result,
+                "code": code,
+            }
         )
-    return result
+    )
diff --git a/app/utils/smt/operations/config_by_impact.py b/app/utils/smt/operations/config_by_impact.py
@@ -1,10 +1,14 @@
 from z3 import Abs, Optimize, sat, unknown
 
+from fastapi import status
+from fastapi.responses import JSONResponse
+
 from app.utils.smt.config_sanitizer import config_sanitizer
 from app.utils.smt.model import SMTModel
+from app.utils import json_encoder
 
 
-async def execute_config_by_impact(model: SMTModel, impact: int) -> list[dict[str, float | int]] | str:
+async def execute_config_by_impact(model: SMTModel, impact: int) -> JSONResponse:
     solver = Optimize()
     solver.set("timeout", 3000)
     result = []
@@ -13,13 +17,19 @@ async def execute_config_by_impact(model: SMTModel, impact: int) -> list[dict[st
         obj = Abs(impact - impact)
         solver.minimize(obj)
     solver.add(model.domain)
-    while solver.check() == sat:
+    if solver.check() == sat:
         config = solver.model()
         sanitized_config = await config_sanitizer(model.node_type, config)
         result.append(sanitized_config)
-        break
-    if solver.check() == unknown:
-        result = (
-            "Execution timed out after 3 seconds. The complexity of the model is too high, try lowering the maximum level of the graph."
+        code = "operation_success"
+    elif solver.check() == unknown:
+        result = ""
+        code = "smt_timeout"
+    return JSONResponse(
+        status_code=status.HTTP_200_OK, content=json_encoder(
+            {
+                "result": result,
+                "code": code,
+            }
         )
-    return result
+    )
diff --git a/app/utils/smt/operations/filter_configs.py b/app/utils/smt/operations/filter_configs.py
@@ -1,10 +1,14 @@
 from z3 import And, Or, Solver, sat, unknown
 
+from fastapi import status
+from fastapi.responses import JSONResponse
+
 from app.utils.smt.config_sanitizer import config_sanitizer
 from app.utils.smt.model import SMTModel
+from app.utils import json_encoder
 
 
-async def execute_filter_configs(model: SMTModel, max_threshold: float, min_threshold: float, limit: int) -> list[dict[str, float | int]] | str:
+async def execute_filter_configs(model: SMTModel, max_threshold: float, min_threshold: float, limit: int) -> JSONResponse:
     if model.func_obj is not None:
         impact = model.func_obj
         max_ctc = impact <= max_threshold
@@ -25,7 +29,15 @@ async def execute_filter_configs(model: SMTModel, max_threshold: float, min_thre
                     block.append(config[var] != variable)
         solver.add(Or(block))
     if solver.check() == unknown:
-        result = (
-            "Execution timed out after 3 seconds. The complexity of the model is too high, try lowering the maximum level of the graph."
+        result = ""
+        code = "smt_timeout"
+    else:
+        code = "operation_success"
+    return JSONResponse(
+        status_code=status.HTTP_200_OK, content=json_encoder(
+            {
+                "result": result,
+                "code": code,
+            }
         )
-    return result
+    )
diff --git a/app/utils/smt/operations/maximize_impact.py b/app/utils/smt/operations/maximize_impact.py
@@ -1,10 +1,14 @@
 from z3 import Optimize, Or, sat, unknown
 
+from fastapi import status
+from fastapi.responses import JSONResponse
+
 from app.utils.smt.config_sanitizer import config_sanitizer
 from app.utils.smt.model import SMTModel
+from app.utils import json_encoder
 
 
-async def execute_maximize_impact(model: SMTModel, limit: int) -> list[dict[str, float | int]] | str:
+async def execute_maximize_impact(model: SMTModel, limit: int) -> JSONResponse:
     solver = Optimize()
     solver.set("timeout", 3000)
     result = []
@@ -24,7 +28,15 @@ async def execute_maximize_impact(model: SMTModel, limit: int) -> list[dict[str,
                     block.append(config[var] != variable)
         solver.add(Or(block))
     if solver.check() == unknown:
-        result = (
-            "Execution timed out after 3 seconds. The complexity of the model is too high, try lowering the maximum level of the graph."
+        result = ""
+        code = "smt_timeout"
+    else:
+        code = "operation_success"
+    return JSONResponse(
+        status_code=status.HTTP_200_OK, content=json_encoder(
+            {
+                "result": result,
+                "code": code,
+            }
         )
-    return result
+    )
diff --git a/app/utils/smt/operations/minimize_impact.py b/app/utils/smt/operations/minimize_impact.py
@@ -1,10 +1,14 @@
 from z3 import Optimize, Or, sat, unknown
 
+from fastapi import status
+from fastapi.responses import JSONResponse
+
 from app.utils.smt.config_sanitizer import config_sanitizer
 from app.utils.smt.model import SMTModel
+from app.utils import json_encoder
 
 
-async def execute_minimize_impact(model: SMTModel, limit: int) -> list[dict[str, float | int]] | str:
+async def execute_minimize_impact(model: SMTModel, limit: int) -> JSONResponse:
     solver = Optimize()
     solver.set("timeout", 3000)
     result = []
@@ -24,7 +28,15 @@ async def execute_minimize_impact(model: SMTModel, limit: int) -> list[dict[str,
                     block.append(config[var] != variable)
         solver.add(Or(block))
     if solver.check() == unknown:
-        result = (
-            "Execution timed out after 3 seconds. The complexity of the model is too high, try lowering the maximum level of the graph."
+        result = ""
+        code = "smt_timeout"
+    else:
+        code = "operation_success"   
+    return JSONResponse(
+        status_code=status.HTTP_200_OK, content=json_encoder(
+            {
+                "result": result,
+                "code": code,
+            }
         )
-    return result
+    )
diff --git a/app/utils/smt/operations/valid_config.py b/app/utils/smt/operations/valid_config.py
diff --git a/app/utils/smt/operations/valid_graph.py b/app/utils/smt/operations/valid_graph.py
