Fix unit tests

.github/workflows/pr-tests-stack.yml

@@ -30,7 +30,7 @@ jobs:
         # os: [om-ci-16vcpu-ubuntu2204]
         os: [ubuntu-latest]
         python-version: ["3.12"]
-        pytest-modules: ["frontend network container_workload"]
+        pytest-modules: ["frontend network container_workload local_node"]
       fail-fast: false
 
     runs-on: ${{matrix.os}}

.github/workflows/pr-tests-syft.yml

@@ -88,9 +88,11 @@ jobs:
         run: |
           pip install --upgrade tox packaging wheel --default-timeout=60
 
-      - name: Docker on MacOS
-        if: steps.changes.outputs.syft == 'true' && matrix.os == 'macos-latest'
-        uses: crazy-max/ghaction-setup-docker@v3.1.0
+      # - name: Docker on MacOS
+      #   if: steps.changes.outputs.syft == 'true' && matrix.os == 'macos-latest'
+      #   uses: crazy-max/ghaction-setup-docker@v3.1.0
+      #   with:
+      #     set-host: true
 
       - name: Run unit tests
         if: steps.changes.outputs.syft == 'true'

.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
         exclude: ^(packages/grid/ansible/)
       - id: name-tests-test
         always_run: true
-        exclude: ^(packages/grid/backend/grid/tests/utils/)|^(.*fixtures.py)|^packages/syft/tests/.*/utils.py
+        exclude: ^(.*/tests/utils/)|^(.*fixtures.py)
       - id: requirements-txt-fixer
         always_run: true
       - id: mixed-line-ending

packages/grid/backend/grid/core/config.py

@@ -103,7 +103,7 @@ def get_emails_enabled(self) -> Self:
 
     OPEN_REGISTRATION: bool = True
 
-    DOMAIN_ASSOCIATION_REQUESTS_AUTOMATICALLY_ACCEPTED: bool = True
+    # DOMAIN_ASSOCIATION_REQUESTS_AUTOMATICALLY_ACCEPTED: bool = True
     USE_BLOB_STORAGE: bool = (
         True if os.getenv("USE_BLOB_STORAGE", "false").lower() == "true" else False
     )
@@ -117,22 +117,22 @@ def get_emails_enabled(self) -> Self:
     )  # 30 minutes in seconds
     SEAWEED_MOUNT_PORT: int = int(os.getenv("SEAWEED_MOUNT_PORT", 4001))
 
-    REDIS_HOST: str = str(os.getenv("REDIS_HOST", "redis"))
-    REDIS_PORT: int = int(os.getenv("REDIS_PORT", 6379))
-    REDIS_STORE_DB_ID: int = int(os.getenv("REDIS_STORE_DB_ID", 0))
-    REDIS_LEDGER_DB_ID: int = int(os.getenv("REDIS_LEDGER_DB_ID", 1))
-    STORE_DB_ID: int = int(os.getenv("STORE_DB_ID", 0))
-    LEDGER_DB_ID: int = int(os.getenv("LEDGER_DB_ID", 1))
-    NETWORK_CHECK_INTERVAL: int = int(os.getenv("NETWORK_CHECK_INTERVAL", 60))
-    DOMAIN_CHECK_INTERVAL: int = int(os.getenv("DOMAIN_CHECK_INTERVAL", 60))
+    # REDIS_HOST: str = str(os.getenv("REDIS_HOST", "redis"))
+    # REDIS_PORT: int = int(os.getenv("REDIS_PORT", 6379))
+    # REDIS_STORE_DB_ID: int = int(os.getenv("REDIS_STORE_DB_ID", 0))
+    # REDIS_LEDGER_DB_ID: int = int(os.getenv("REDIS_LEDGER_DB_ID", 1))
+    # STORE_DB_ID: int = int(os.getenv("STORE_DB_ID", 0))
+    # LEDGER_DB_ID: int = int(os.getenv("LEDGER_DB_ID", 1))
+    # NETWORK_CHECK_INTERVAL: int = int(os.getenv("NETWORK_CHECK_INTERVAL", 60))
+    # DOMAIN_CHECK_INTERVAL: int = int(os.getenv("DOMAIN_CHECK_INTERVAL", 60))
     CONTAINER_HOST: str = str(os.getenv("CONTAINER_HOST", "docker"))
     MONGO_HOST: str = str(os.getenv("MONGO_HOST", ""))
-    MONGO_PORT: int = int(os.getenv("MONGO_PORT", 0))
+    MONGO_PORT: int = int(os.getenv("MONGO_PORT", 27017))
     MONGO_USERNAME: str = str(os.getenv("MONGO_USERNAME", ""))
     MONGO_PASSWORD: str = str(os.getenv("MONGO_PASSWORD", ""))
     DEV_MODE: bool = True if os.getenv("DEV_MODE", "false").lower() == "true" else False
     # ZMQ stuff
-    QUEUE_PORT: int = int(os.getenv("QUEUE_PORT", 0))
+    QUEUE_PORT: int = int(os.getenv("QUEUE_PORT", 5556))
     CREATE_PRODUCER: bool = (
         True if os.getenv("CREATE_PRODUCER", "false").lower() == "true" else False
     )
@@ -145,8 +145,8 @@ def get_emails_enabled(self) -> Self:
     EMAIL_SENDER: str = os.getenv("EMAIL_SENDER", "")
     SMTP_PASSWORD: str = os.getenv("SMTP_PASSWORD", "")
     SMTP_TLS: bool = True
-    SMTP_PORT: str | None = os.getenv("SMTP_PORT", "")
-    SMTP_HOST: str | None = os.getenv("SMTP_HOST", "")
+    SMTP_PORT: int = int(os.getenv("SMTP_PORT", 587))
+    SMTP_HOST: str = os.getenv("SMTP_HOST", "")
 
     TEST_MODE: bool = (
         True if os.getenv("TEST_MODE", "false").lower() == "true" else False

packages/grid/docker-compose.yml

@@ -299,7 +299,8 @@ services:
 
 volumes:
   credentials-data:
-  # app-redis-data:
+    labels:
+      orgs.openmined.syft: "this is a syft credentials volume"
   seaweedfs-data:
     labels:
       orgs.openmined.syft: "this is a syft seaweedfs volume"

packages/hagrid/hagrid/cli.py

@@ -2260,13 +2260,15 @@ def create_launch_docker_cmd(
         "NODE_SIDE_TYPE": kwargs["node_side_type"],
         "SINGLE_CONTAINER_MODE": single_container_mode,
         "INMEMORY_WORKERS": in_mem_workers,
-        "SMTP_USERNAME": smtp_username,
-        "SMTP_PASSWORD": smtp_password,
-        "EMAIL_SENDER": smtp_sender,
-        "SMTP_PORT": smtp_port,
-        "SMTP_HOST": smtp_host,
     }
 
+    if smtp_host and smtp_port and smtp_username and smtp_password:
+        envs["SMTP_HOST"] = smtp_host
+        envs["SMTP_PORT"] = smtp_port
+        envs["SMTP_USERNAME"] = smtp_username
+        envs["SMTP_PASSWORD"] = smtp_password
+        envs["EMAIL_SENDER"] = smtp_sender
+
     if "trace" in kwargs and kwargs["trace"] is True:
         envs["TRACE"] = "True"
         envs["JAEGER_HOST"] = "host.docker.internal"

packages/syft/setup.cfg

@@ -120,14 +120,14 @@ test_plugins =
     pytest-asyncio
     pytest-randomly
     pytest-sugar
-    pytest_mock_resources
     python_on_whales
     pytest-lazy-fixture
     pytest-rerunfailures
     coverage
     joblib
     faker
     lxml
+    distro
 
 [options.entry_points]
 console_scripts =

packages/syft/src/syft/client/api.py

@@ -402,11 +402,13 @@ def generate_remote_lib_function(
 
     def wrapper(*args: Any, **kwargs: Any) -> SyftError | Any:
         # relative
-        from ..service.action.action_object import TraceResult
+        from ..service.action.action_object import TraceResultRegistry
 
-        if TraceResult._client is not None:
-            wrapper_make_call = TraceResult._client.api.make_call
-            wrapper_node_uid = TraceResult._client.api.node_uid
+        trace_result = TraceResultRegistry.get_trace_result_for_thread()
+
+        if trace_result is not None:
+            wrapper_make_call = trace_result.client.api.make_call  # type: ignore
+            wrapper_node_uid = trace_result.client.api.node_uid  # type: ignore
         else:
             # somehow this is necessary to prevent shadowing problems
             wrapper_make_call = make_call
@@ -448,7 +450,8 @@ def wrapper(*args: Any, **kwargs: Any) -> SyftError | Any:
         )
         service_args = [action]
         # TODO: implement properly
-        TraceResult.result += [action]
+        if trace_result is not None:
+            trace_result.result += [action]
 
         api_call = SyftAPICall(
             node_uid=wrapper_node_uid,

packages/syft/src/syft/node/node.py

@@ -315,7 +315,7 @@ def __init__(
         smtp_username: str | None = None,
         smtp_password: str | None = None,
         email_sender: str | None = None,
-        smtp_port: str | None = None,
+        smtp_port: int | None = None,
         smtp_host: str | None = None,
     ):
         # 🟡 TODO 22: change our ENV variable format and default init args to make this
@@ -716,6 +716,10 @@ def _find_klasses_pending_for_migration(
             object_version = object_type.__version__
 
             migration_state = migration_state_service.get_state(context, canonical_name)
+            if isinstance(migration_state, SyftError):
+                raise Exception(
+                    f"Failed to get migration state for {canonical_name}. Error: {migration_state}"
+                )
             if (
                 migration_state is not None
                 and migration_state.current_version != migration_state.latest_version

packages/syft/src/syft/protocol/protocol_version.json

@@ -23,7 +23,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "18785a4cce6f25f1900b82f30acb2298b4afeab92bd00d0be358cfbf5a93d97e",
+          "hash": "37bb8f0f87b1da2525da8f6873e6257dff4a732f2dba293b62931ad0b85ef9e2",
           "action": "add"
         }
       },
@@ -40,7 +40,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "4fd4c5b29e395b7a1af3b820166e69af7f267b6e3234fb8329bd0d74adc6e828",
+          "hash": "7c55461e3c6ba36ff999c64eb1b97a65b5a1f27193a973b1355ee2675f14c313",
           "action": "add"
         }
       },
@@ -52,7 +52,7 @@
         },
         "2": {
           "version": 2,
-          "hash": "1b04f527fdabaf329786b6bb38209f6ca82d622fe691d33c47ed1addccaaac02",
+          "hash": "1ab941c7669572a41067a17e0e3f2d9c7056f7a4df8f899e87ae2358d9113b02",
           "action": "add"
         }
       },
@@ -148,7 +148,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "5922c1253370861185c53161ad31e488319f46ea5faee2d1802ca94657c428dc",
+          "hash": "709dc84a946267444a3f9968acf4a5e9807d6aa5143626c3fb635c9282108cc1",
           "action": "add"
         }
       },
@@ -165,7 +165,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "dbb72f43add3141d13a76e18a2a0903a6937966632f0def452ca264f3f70d81b",
+          "hash": "5e84c9905a1816d51c0dfb1eedbfb4d831095ca6c89956c6fe200c2a193cbb8f",
           "action": "add"
         }
       },
@@ -182,7 +182,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "cf831130f66f9addf8f68a8c9df0b67775e53322c8a32e8babc7f21631845608",
+          "hash": "bf936c1923ceee4def4cded06d41766998ea472322b0738bade7b85298e469da",
           "action": "add"
         }
       },
@@ -199,7 +199,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "78334b746e5230ac156e47960e91ce449543d1a77a62d9b8be141882e4b549aa",
+          "hash": "daf3629fb7d26f41f96cd7f9200d7327a4b74d800b3e02afa75454d11bd47d78",
           "action": "add"
         }
       },
@@ -216,7 +216,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "0007e86c39ede0f5756ba348083f809c5b6e3bb3a0a9ed6b94570d808467041f",
+          "hash": "4747a220d1587e99e6ac076496a2aa7217e2700205ac80fc24fe4768a313da78",
           "action": "add"
         }
       },
@@ -300,7 +300,7 @@
         },
         "2": {
           "version": 2,
-          "hash": "9eaed0a784525dea0018d95de74d70ed212f20f6ead2b50c66e59467c42bbe68",
+          "hash": "b35897295822f061fbc70522ca8967cd2be53a5c01b19e24c587cd7b0c4aa3e8",
           "action": "add"
         }
       },
@@ -574,7 +574,7 @@
         },
         "4": {
           "version": 4,
-          "hash": "077987cfc94d617f746f27fb468210330c328bad06eee09a89226759e5745a5f",
+          "hash": "c37bc1c6303c467050ce4f8faa088a2f66ef1781437ffe34f15aadf5477ac25b",
           "action": "add"
         }
       },
@@ -608,7 +608,7 @@
         },
         "3": {
           "version": 3,
-          "hash": "8a8e721a4ca8aa9107403368851acbe59f8d7bdc1eeff0ff101a44e325a058ff",
+          "hash": "4159d6ea45bc82577828bc19d668196422ff29bb8cc298b84623e6f4f476aaf3",
           "action": "add"
         }
       },
@@ -630,7 +630,7 @@
         },
         "4": {
           "version": 4,
-          "hash": "9b0dd1a64d64b1e824746e93aae0ca14863d2430aea2e2a758945edbfcb79bc9",
+          "hash": "dae431b87cadacfd30613519b5dd25d2e4ff59d2a971e21a31d56901103b9420",
           "action": "add"
         }
       },
@@ -659,7 +659,7 @@
         },
         "2": {
           "version": 2,
-          "hash": "6cd89ed24027ed94b3e2bb7a07e8932060e07e481ceb35eb7ee4d2d0b6e34f43",
+          "hash": "bc4bbe67d75d5214e79ff57077dac5762bba98760e152f9613a4f8975488d960",
           "action": "add"
         }
       },
@@ -1237,7 +1237,7 @@
         },
         "2": {
           "version": 2,
-          "hash": "747c87b947346fb0fc0466a912e2dc743ee082ef6254079176349d6b63748c32",
+          "hash": "93c75b45b9b74c69243cc2f2ef2d661e11eef5c23ecf71692ffdbd467d11efe6",
           "action": "add"
         }
       },
@@ -1525,7 +1525,7 @@
         },
         "2": {
           "version": 2,
-          "hash": "ac452023b98534eb13cb99a86fa7e379c08316353fc0837d1b788e0050e13ab9",
+          "hash": "24b7c302f9821afe073534d4ed02c377bd4f7cb691f66ca92b94c38c92dc78c2",
           "action": "add"
         }
       },
@@ -1537,7 +1537,7 @@
         },
         "2": {
           "version": 2,
-          "hash": "c9fdefdc622131c3676243aafadc30b7e67ee155793791bf1000bf742c1a251a",
+          "hash": "6d2e2f64c00dcda74a2545c77abbcf1630c56c26014987038feab174d15bd9d7",
           "action": "add"
         }
       },

packages/syft/src/syft/service/action/action_graph.py

@@ -227,7 +227,9 @@ def _thread_safe_cbk(
         # TODO copied method from document_store, have it in one place and reuse?
         locked = self.lock.acquire(blocking=True)
         if not locked:
-            return Err("Failed to acquire lock for the operation")
+            return Err(
+                f"Failed to acquire lock for the operation {self.lock.lock_name} ({self.lock._lock})"
+            )
         try:
             result = cbk(*args, **kwargs)
         except BaseException as e: