Merge branch 'dev' into aziz/sqlite_no_pool

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

@@ -372,10 +372,12 @@ def __init__(
 
  use_sqlite = local_db or (processes > 0 and not is_subprocess)
  document_store_config = document_store_config or self.get_default_store(
- use_sqlite=use_sqlite
+ use_sqlite=use_sqlite,
+ store_type="Document Store",
  )
  action_store_config = action_store_config or self.get_default_store(
- use_sqlite=use_sqlite
+ use_sqlite=use_sqlite,
+ store_type="Action Store",
  )
  self.init_stores(
  action_store_config=action_store_config,
@@ -434,12 +436,15 @@ def runs_in_docker(self) -> bool:
  and any("docker" in line for line in open(path))
  )
 
- def get_default_store(self, use_sqlite: bool) -> StoreConfig:
+ def get_default_store(self, use_sqlite: bool, store_type: str) -> StoreConfig:
  if use_sqlite:
  path = self.get_temp_dir("db")
+ file_name: str = f"{self.id}.sqlite"
+ if self.dev_mode:
+ print(f"{store_type}'s SQLite DB path: {path/file_name}")
  return SQLiteStoreConfig(
  client_config=SQLiteStoreClientConfig(
- filename=f"{self.id}.sqlite",
+ filename=file_name,
  path=path,
  )
  )

packages/syft/src/syft/service/request/request.py

@@ -467,9 +467,9 @@ def _coll_repr_(self) -> dict[str, str | dict[str, str]]:
  ]
 
  return {
- "Request time": str(self.request_time),
  "Description": self.html_description,
  "Requested By": "\n".join(user_data),
+ "Creation Time": str(self.request_time),
  "Status": status_badge,
  }
 
@@ -1220,18 +1220,19 @@ def nested_repr(self, node: Any | None = None, level: int = 0) -> str:
 
  def __repr_syft_nested__(self) -> str:
  msg = (
- f"Request to change <b>{self.code.service_func_name}</b> "
- f"(Pool Id: <b>{self.code.worker_pool_name}</b>) "
+ f"Request to change <strong>{self.code.service_func_name}</strong> "
+ f"(Pool Id: <strong>{self.code.worker_pool_name}</strong>) "
  )
- msg += "to permission <strong>RequestStatus.APPROVED.</strong>"
- if self.nested_solved:
- if self.link.nested_codes == {}: # type: ignore
- msg += "No nested requests."
- else:
+ msg += "to permission RequestStatus.APPROVED."
+ if self.code.nested_codes is None or self.code.nested_codes == {}: # type: ignore
+ msg += " No nested requests"
+ else:
+ if self.nested_solved:
+ # else:
  msg += "<br><br>This change requests the following nested functions calls:<br>"
  msg += self.nested_repr()
- else:
- msg += "Nested Requests not resolved."
+  else:
+  msg += " Nested Requests not resolved"
  return msg
 
  def _repr_markdown_(self, wrap_as_python: bool = True, indent: int = 0) -> str: