fix some bugs in deployment

Author: Reapor-Yurnero

projects/sbos-minimal/sbos/minimal/interfaces/graphdb.py

@@ -214,7 +214,7 @@ async def query(
         )
         query_str = resp.content.decode("utf-8")
         query_str = ast.literal_eval(query_str)
-        # logger.debug(query_str)
+        logger.debug(query_str)
         data = {
             "query": query_str,
             "infer": True,
@@ -243,8 +243,9 @@ async def query(
             prefixes = self.parse_prefix(query_str)
         else:
             prefixes = {}
+        logger.debug(result)
+        logger.debug(prefixes)
         return result, prefixes
-        # logger.debug(result)
         # parsed_result = self.parse_result(result, prefixes)
         # logger.debug(parsed_result)
         # return parsed_result

projects/sbos-minimal/sbos/minimal/utilities/utils.py

@@ -10,9 +10,12 @@
 
 
 async def get_external_references(domain, entity_id):
+    if entity_id.startswith("http"):
+        entity_id = f"<{entity_id}>"
+
     query = f"""
 select distinct ?k ?v where {{
-    <{entity_id}> ref:hasExternalReference ?o .
+    {entity_id} ref:hasExternalReference ?o .
     ?o ?k ?v .
 }}
         """

projects/sbos-monitor/sbos/monitor/config/settings/base.py

@@ -25,7 +25,7 @@ class MonitorBaseSettings(DatabaseMongoDBSettings):
     PLAYGROUND_HOST: str = Field(default="localhost", description="The hostname of playground server.")
     PLAYGROUND_PORT: int = Field(default=9000, description="The port of playground server")
     PLAYGROUND_JWT_TOKEN: str = Field(default="eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJsaXV5aDk3MDYxNUBnbWFpbC5jb20iLCJhdWQiOlsiYnJpY2siXSwiZXhwIjoxNzQ2ODI1MzgyfQ.f2p6KSknZ0oWWY769mpZzZWEqDb4HK3h40WhF0Tlj7Q")
-    POLLING_INTERVAL: float = Field(default=5, description="The interval of polling in seconds.")
+    POLLING_INTERVAL: float = Field(default=60, description="The interval of polling in seconds.")
 
     class Config:
         env_file: str = f"{str(ROOT_DIR)}/.env"

projects/sbos-playground/sbos/playground/interfaces/scheduling_policy/naive.py

@@ -1,5 +1,6 @@
 import itertools
 from typing import Any, List
+import asyncio
 
 from loguru import logger
 from sbos.minimal.interfaces import ActuationInterface, AsyncpgTimeseries

projects/sbos-playground/sbos/playground/securities/auth.py

@@ -280,14 +280,15 @@ async def fallback_func() -> tuple[set[str], dict[str, str]]:
                 entity_ids.update(entity_ids_domain_user)
                 prefixes.update(prefixes_domain_user)
             if self.domain_user_app is not None:
+                profile = await self.app.approved_data.permission_profile.fetch()
                 entity_ids_app, prefixes_app = (
                     await self.get_authorized_entities_in_profile(
-                        self.app.profile, self.domain_user_app.arguments, permission
+                        profile, self.domain_user_app.arguments, permission
                     )
                 )
-                if self.app.permission_model == PermissionModel.AUGMENTATION:
+                if self.app.approved_data.permission_model == PermissionModel.AUGMENTATION:
                     entity_ids.update(entity_ids_app)
-                elif self.app.permission_model == PermissionModel.INTERSECTION:
+                elif self.app.approved_data.permission_model == PermissionModel.INTERSECTION:
                     entity_ids.intersection_update(entity_ids_app)
                 prefixes.update(prefixes_app)
             return entity_ids, prefixes

projects/sbos-playground/sbos/playground/services/user.py

@@ -234,21 +234,23 @@ async def _operate_container(
         container_name = domain_user_app.get_container_name()
         container = get_container(container_name)
         try:
+            if operation == "create" or operation == "start":
+                await domain_user_app.fetch_all_links()
+                token = await create_jwt_token(
+                    domain=domain_user_app.domain,
+                    user=domain_user_app.user,
+                    app=domain_user_app.app,
+                    domain_user_app=domain_user_app,
+                )
+                logger.info("app token: {}", token)
+                domain_user_app.token = token
             if container is None:
                 if operation == "create" or operation == "start":
-                    await domain_user_app.fetch_all_links()
-                    token = await create_jwt_token(
-                        domain=domain_user_app.domain,
-                        user=domain_user_app.user,
-                        app=domain_user_app.app,
-                        domain_user_app=domain_user_app,
-                    )
-                    domain_user_app.token = token
                     container = spawn_app(
                         domain_user_app.app.name,
                         container_name,
                         start=start,
-                        token=token,
+                        token=domain_user_app.token,
                     )
             else:
                 if operation == "start" and container.status != DockerStatus.RUNNING: