Merge pull request #3845 from architecture-building-systems/fix-limit-checks

Check limits only if not local

Author: reyery

cea/interfaces/dashboard/api/contents.py

@@ -21,7 +21,7 @@
 from cea.interfaces.dashboard.api.project import get_project_choices
 from cea.interfaces.dashboard.dependencies import CEAProjectRoot
 from cea.interfaces.dashboard.lib.logs import getCEAServerLogger
-from cea.interfaces.dashboard.settings import LimitSettings
+from cea.interfaces.dashboard.settings import LimitSettings, get_settings
 from cea.interfaces.dashboard.utils import secure_path, OutsideProjectRootError
 
 # TODO: Make this configurable
@@ -190,19 +190,21 @@ async def upload_scenario(form: Annotated[UploadScenario, Form()], project_root:
     project_name = form.project.strip()
     project_path = Path(secure_path(Path(project_root, project_name).resolve()))
 
+    settings = get_settings()
     limit_settings = LimitSettings()
-    num_projects = len(await get_project_choices(project_root))
-    if form.type == "new" and limit_settings.num_projects is not None and limit_settings.num_projects <= num_projects:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"Maximum number of projects reached ({limit_settings.num_projects}). Number of projects found: {num_projects}",
-        )
-    num_scenarios = len(cea.config.get_scenarios_list(str(project_path)))
-    if limit_settings.num_scenarios is not None and limit_settings.num_scenarios <= num_scenarios:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"Maximum number of scenarios reached ({limit_settings.num_scenarios}). Number of scenarios found: {num_scenarios}",
+    if not settings.local:
+        num_projects = len(await get_project_choices(project_root))
+        if form.type == "new" and limit_settings.num_projects is not None and limit_settings.num_projects <= num_projects:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=f"Maximum number of projects reached ({limit_settings.num_projects}). Number of projects found: {num_projects}",
             )
+        num_scenarios = len(cea.config.get_scenarios_list(str(project_path)))
+        if limit_settings.num_scenarios is not None and limit_settings.num_scenarios <= num_scenarios:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=f"Maximum number of scenarios reached ({limit_settings.num_scenarios}). Number of scenarios found: {num_scenarios}",
+                )
 
     # Check for existing projects
     if form.type == "current" or form.type == "existing":
@@ -299,12 +301,14 @@ def is_gh_export_path(path: str):
                                     detail=f"Scenarios {existing_scenario_names} already exists in project")
 
             # Recheck number of scenarios after extraction
-            num_scenarios += len(scenario_names)
-            if limit_settings.num_scenarios is not None and limit_settings.num_scenarios < num_scenarios:
-                raise HTTPException(
-                    status_code=status.HTTP_400_BAD_REQUEST,
-                    detail=f"Maximum number of scenarios reached ({limit_settings.num_scenarios}). Number of scenarios found: {num_scenarios}",
-                    )
+            if not settings.local:
+                num_scenarios = len(cea.config.get_scenarios_list(str(project_path)))
+                num_scenarios += len(scenario_names)
+                if limit_settings.num_scenarios is not None and limit_settings.num_scenarios < num_scenarios:
+                    raise HTTPException(
+                        status_code=status.HTTP_400_BAD_REQUEST,
+                        detail=f"Maximum number of scenarios reached ({limit_settings.num_scenarios}). Number of scenarios found: {num_scenarios}",
+                        )
 
 
             for potential_scenario in potential_scenario_paths:

cea/interfaces/dashboard/api/project.py

@@ -27,7 +27,7 @@
     CEASeverDemoAuthCheck
 from cea.interfaces.dashboard.lib.database.session import SessionDep
 from cea.interfaces.dashboard.lib.logs import getCEAServerLogger
-from cea.interfaces.dashboard.settings import LimitSettings
+from cea.interfaces.dashboard.settings import LimitSettings, get_settings
 from cea.interfaces.dashboard.utils import secure_path, OutsideProjectRootError
 from cea.utilities.dbf import dbf_to_dataframe
 from cea.utilities.standardize_coordinates import get_geographic_coordinate_system, raster_to_WSG_and_UTM
@@ -249,13 +249,15 @@ async def create_new_project(project_root: CEAProjectRoot, new_project: NewProje
     """
     Create new project folder
     """
+    settings = get_settings()
     limit_settings = LimitSettings()
-    num_projects = len(await get_project_choices(project_root))
-    if limit_settings.num_projects is not None and limit_settings.num_projects <= num_projects:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"Maximum number of projects reached ({limit_settings.num_projects}). Number of projects found: {num_projects}",
-        )
+    if not settings.local:
+        num_projects = len(await get_project_choices(project_root))
+        if limit_settings.num_projects is not None and limit_settings.num_projects <= num_projects:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=f"Maximum number of projects reached ({limit_settings.num_projects}). Number of projects found: {num_projects}",
+            )
 
     if new_project.project_root is None and project_root is None:
         raise HTTPException(
@@ -350,13 +352,15 @@ async def create_new_scenario_v2(project_root: CEAProjectRoot, scenario_form: An
             detail=str(e),
         )
 
+    settings = get_settings()
     limit_settings = LimitSettings()
-    num_scenarios = len(cea.config.get_scenarios_list(cea_project))
-    if limit_settings.num_scenarios is not None and limit_settings.num_scenarios <= num_scenarios:
-        raise HTTPException(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            detail=f"Maximum number of scenarios reached ({limit_settings.num_scenarios}). Number of scenarios found: {num_scenarios}",
-        )
+    if not settings.local:
+        num_scenarios = len(cea.config.get_scenarios_list(cea_project))
+        if limit_settings.num_scenarios is not None and limit_settings.num_scenarios <= num_scenarios:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail=f"Maximum number of scenarios reached ({limit_settings.num_scenarios}). Number of scenarios found: {num_scenarios}",
+            )
 
     scenario_name = os.path.normpath(scenario_form.scenario_name)
     if scenario_name == "." or scenario_name == ".." or os.path.basename(scenario_name) != scenario_name:
@@ -388,13 +392,13 @@ async def create_zone(scenario_form, locator):
             # Ensure that zone exists
             zone_df = geopandas.read_file(locator.get_zone_geometry())
 
-            limit_settings = LimitSettings()
-            num_buildings = len(zone_df)
-            if limit_settings.num_buildings is not None and limit_settings.num_buildings <= num_buildings:
-                raise HTTPException(
-                    status_code=status.HTTP_400_BAD_REQUEST,
-                    detail=f"Maximum number of buildings reached ({limit_settings.num_buildings}). Number of buildings found: {num_buildings}",
-                )
+            if not settings.local:
+                num_buildings = len(zone_df)
+                if limit_settings.num_buildings is not None and limit_settings.num_buildings <= num_buildings:
+                    raise HTTPException(
+                        status_code=status.HTTP_400_BAD_REQUEST,
+                        detail=f"Maximum number of buildings reached ({limit_settings.num_buildings}). Number of buildings found: {num_buildings}",
+                    )
 
         # Copy zone from user-input
         else: