fix static class to dict for mutable params

Author: wd400

services/base/AutoDiscServer/libs/adtool_default/maps/LeniaParameterMap.py

@@ -113,13 +113,11 @@ def sample(self) -> Dict:
 
         # convert to parameter objects
         dp = LeniaDynamicalParameters().from_tensor(p_dyn_tensor)
-        print("before asdict(dp):", dp, file=sys.stderr)
         p_dict = {
             "dynamic_params": asdict(dp),
             "genome": genome,
             "neat_config": self.neat.neat_config,
         }
-        print("after asdict(dp):", p_dict, file=sys.stderr)
 
         return p_dict
 

services/base/AutoDiscServer/libs/adtool_default/systems/ExponentialMixture.py

@@ -17,11 +17,10 @@
 
 matplotlib.use("Agg")
 
-
 @dataclass
 class SystemParams(Defaults):
-    sequence_max: float = field(default_factory=lambda: defaults(100.0, min=0.0, max=1000.0))
-    sequence_density: int = field(default_factory=lambda: defaults(100, min=1, max=1000))
+    sequence_max: float = field(default_factory=lambda:defaults(100.0, min=0.0, max=1000.0))
+    sequence_density: int = field(default_factory= lambda:defaults(100, min=1, max=1000))
 
 
 print("SystemParams", SystemParams, file=sys.stderr)

services/base/AutoDiscServer/libs/auto_disc/auto_disc/utils/expose_config/defaults.py

@@ -1,5 +1,6 @@
 from copy import deepcopy
 from dataclasses import asdict, dataclass, fields, is_dataclass
+import dataclasses
 from typing import Any, Callable, List, Optional
 
 from addict import Dict
@@ -100,6 +101,11 @@ def recurse(dc: type, parent: str):
                     if k in config_dict:
                         raise ValueError(f"Config option {k} already exists.")
                     else:
+                        # consider default_factory
+                        if v.default_factory is not dataclasses.MISSING:
+                            unwrap_v = v.default_factory()
+                        
+                        
                         print("unwrap_v", unwrap_v, file=sys.stderr)
                         config_dict[k] = asdict(unwrap_v)
 
@@ -111,6 +117,7 @@ def recurse(dc: type, parent: str):
                         config_dict[k]["parent"] = parent
 
         recurse(cls, "")
+        print("config_dict", config_dict, file=sys.stderr  )
         return config_dict
 
 

services/dev/docker-compose.yml

@@ -3,56 +3,56 @@ version: "3" # TODO
 services:
   ##### FRONTEND APP #####
   app:
-    extends:
-      file: ../base/docker-compose.yml
-      service: app
+    # extends:
+    #   file: ../base/docker-compose.yml
+    #   service: app
     environment:
       DEBUG: 1
   ##### GATEWAY #####
   gateway:
-    extends:
-      file: ../base/docker-compose.yml
-      service: gateway
+    # extends:
+    #   file: ../base/docker-compose.yml
+    #   service: gateway
     extra_hosts:
       - "host.docker.internal:host-gateway" # Useful for debug on Linux
   ##### APP DB #####
   app-db:
-    extends:
-      file: ../base/docker-compose.yml
-      service: app-db
+    # extends:
+    #   file: ../base/docker-compose.yml
+    #   service: app-db
     ports:
       - "$EXPOSED_APP_DB_PORT:5432"
   app-db-api:
-    extends:
-      file: ../base/docker-compose.yml
-      service: app-db-api
+    # extends:
+    #   file: ../base/docker-compose.yml
+    #   service: app-db-api
     ports:
       - "$EXPOSED_APP_DB_API_PORT:80"
   ##### EXPE DB #####
   expe-db:
-    extends:
-      file: ../base/docker-compose.yml
-      service: expe-db
+    # extends:
+    #   file: ../base/docker-compose.yml
+    #   service: expe-db
     ports:
       - "$EXPOSED_EXPE_DB_PORT:27017"
   expe-db-api:
-    extends:
-      file: ../base/docker-compose.yml
-      service: expe-db-api
+    # extends:
+    #   file: ../base/docker-compose.yml
+    #   service: expe-db-api
     ports:
       - "$EXPOSED_EXPE_DB_API_PORT:80"
   ##### AUTODISC SERVER #####
   autodisc-server:
-    extends:
-      file: ../base/docker-compose.yml
-      service: autodisc-server
+    # extends:
+    #   file: ../base/docker-compose.yml
+    #   service: autodisc-server
     ports:
       - "$EXPOSED_AUTODISC_SERVER_PORT:80"
   ##### JUPYTER LAB #####
-  jupyter:
-    extends:
-      file: ../base/docker-compose.yml
-      service: jupyter
+  # jupyter:
+  #   extends:
+  #     file: ../base/docker-compose.yml
+  #     service: jupyter
   ##### MONITORING TOOLS #####
   dozzle:
     image: amir20/dozzle:latest

services/dev/sample.env

@@ -0,0 +1,33 @@
+# CONFIG
+SSH_CONFIG_FOLDER=~/.ssh
+SSH_SOCK_PATH=/run/user/1001/keyring/ssh
+LOG_FILE=/tmp/log/autoDiscToolLog
+
+# SERVICES ACCESS
+## MAIN SERVICES
+EXPOSED_APP_PORT=4200
+
+## NETWORKING
+EXPOSED_GATEWAY_PORT=4201
+
+# AUTO_DISC INTERNAL CONFIG
+MONGO_INITDB_ROOT_USERNAME=autodisc
+MONGO_INITDB_ROOT_PASSWORD=password
+POSTGRES_DB=main
+POSTGRES_USER=autodisc
+POSTGRES_PASSWORD=password
+PGRST_DB_SCHEMA=public
+PGRST_DB_ANON_ROLE=autodisc
+PGADMIN_DEFAULT_EMAIL=[email protected]
+PGADMIN_DEFAULT_PASSWORD=autodisc
+
+
+# DEBUG
+EXPOSED_APP_DB_PORT=5432
+EXPOSED_APP_DB_API_PORT=80
+EXPOSED_EXPE_DB_PORT=27017
+EXPOSED_EXPE_DB_API_PORT=80
+EXPOSED_AUTODISC_SERVER_PORT=80
+DOZZLE_PORT=8080
+PGADMIN_PORT=5050
+