ws-bom-robot-app 0.0.12__py3-none-any.whl → 0.0.14__py3-none-any.whl

ws_bom_robot_app/config.py

@@ -13,7 +13,7 @@ class Settings(BaseSettings):
     robot_data_db_folder_out: str = 'out'
     robot_data_db_folder_store: str = 'store'
     robot_data_db_retention_days: float = 60
-    robot_task_max_concurrent: int = os.cpu_count() or 1
+    robot_task_max_total_parallelism: int = 2 * (os.cpu_count() or 1)
     robot_task_retention_days: float = 1
     robot_cms_host: str = ''
     robot_cms_auth: str = ''

ws_bom_robot_app/task_manager.py

@@ -133,7 +133,7 @@ class TaskStatistics(BaseModel):
 
 #region interface
 class TaskManagerStrategy(ABC):
-    def __init__(self, max_concurrent_tasks: int = floor(2 * config.robot_task_max_concurrent / config.runtime_options().number_of_workers)):
+    def __init__(self, max_concurrent_tasks: int = floor(config.robot_task_max_total_parallelism / config.runtime_options().number_of_workers)):
         self.max_concurrent_tasks = max_concurrent_tasks
         self.semaphore = asyncio.Semaphore(self.max_concurrent_tasks)
         self.running_tasks = dict[str, TaskEntry]()
@@ -184,6 +184,8 @@ class TaskManagerStrategy(ABC):
                 task_entry.status.metadata.end_at = str(datetime.now().isoformat())
                 #strategy-specific behavior
                 self.update_task_status(task_entry)
+                #remove from running tasks
+                del self.running_tasks[task_entry.id]
                 #notify webhooks
                 if headers and headers.x_ws_bom_webhooks:
                       asyncio.create_task(
@@ -203,12 +205,11 @@ class TaskManagerStrategy(ABC):
     async def _run_task_with_semaphore(self, task_entry: TaskEntry):
         """Run a task with semaphore control to limit concurrency."""
         async with self.semaphore:
-          self.running_tasks[task_entry.id]=task_entry
           await self._execute_task(task_entry)
-          del self.running_tasks[task_entry.id]
 
     async def _execute_task(self, task_entry: TaskEntry):
         """Execute a task and handle its lifecycle."""
+        self.running_tasks[task_entry.id]=task_entry
         task_entry.status.metadata.start_at = str(datetime.now().isoformat())
         task_entry.task = asyncio.create_task(task_entry.coroutine)
         task_entry.task.add_done_callback(self.task_done_callback(task_entry, task_entry.headers))

{ws_bom_robot_app-0.0.12.dist-info → ws_bom_robot_app-0.0.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ws_bom_robot_app
-Version: 0.0.12
+Version: 0.0.14
 Summary: A FastAPI application serving ws bom/robot/llm platform ai.
 Home-page: https://github.com/websolutespa/bom
 Author: Websolute Spa
@@ -69,19 +69,21 @@ robot_cms_files_folder=llmKbFile
 
   ```bash
   fastapi dev --port 6001
-  #uvicorn --reload --host 0.0.0.0 --port 6001 main:app
+  #uvicorn main:app --app-dir ./ws_bom_robot_app --reload --host 0.0.0.0 --port 6001 
   ```  
 
 - production
 
-  ```bash
-  fastapi run --port 6001
+  ```bash  
+  uvicorn main:app --host 0.0.0.0 --port 6001  
   ```
 
 - production with [multipler workers](https://fastapi.tiangolo.com/deployment/server-workers/#multiple-workers)
 
   ```bash
   fastapi run --port 6001 --workers 4
+  #uvicorn main:app --host 0.0.0.0 --port 6001 --workers 4
+  #gunicorn -w 4 -k uvicorn.workers.UvicornWorker main:app --bind
   ```
 
 ### 🔖 Windows requirements  

{ws_bom_robot_app-0.0.12.dist-info → ws_bom_robot_app-0.0.14.dist-info}/RECORD

@@ -1,9 +1,9 @@
 ws_bom_robot_app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws_bom_robot_app/auth.py,sha256=84nIbmJsMrNs0sxIQGEHbjsjc2P6ZrZZGSn8dkiL6is,895
-ws_bom_robot_app/config.py,sha256=6elpogZZW8QXD7oJX4DhYTLqsVFHq2wMcR1fz1X4qdo,3157
+ws_bom_robot_app/config.py,sha256=V5ZrX_JnzpsN32hTTezTfOvEZYkIQBy0lxIQ9JFHdFE,3170
 ws_bom_robot_app/cron_manager.py,sha256=0Yt5AMTPGlXZ_M5ck0SKMX8wvzoPsseEezg_s0Q3HKY,9224
 ws_bom_robot_app/main.py,sha256=MIR2WgxX9HwkNSY2JMRRxrLt-ZGs_TfrhX_BbTbigTI,3909
-ws_bom_robot_app/task_manager.py,sha256=7rPFvYzaVL4DSKjLXCX5SXA3mN5qJ7OwfLS0-hvvRwE,15885
+ws_bom_robot_app/task_manager.py,sha256=Lb79EvdJBY-Ko88OzGqPVbnVYvBJ2I0q9pzet848yBs,15936
 ws_bom_robot_app/util.py,sha256=3aBK-bhsvKJwJeWOHh0c1B1BOyJ_tnUxOa1mJmFKwYQ,2618
 ws_bom_robot_app/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws_bom_robot_app/llm/agent_description.py,sha256=SDJYMmwfdMxEK3a_HDEQ19bfNKmwMSFf5hqU0VSCCIE,4705
@@ -39,7 +39,7 @@ ws_bom_robot_app/llm/vector_store/integration/sitemap.py,sha256=nPbIywp-ZwWbWStv
 ws_bom_robot_app/llm/vector_store/loader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ws_bom_robot_app/llm/vector_store/loader/base.py,sha256=dhZ7F4EJmuYa2TBMggWVpQe4_NmS2wi312lHnNm5Jm0,4571
 ws_bom_robot_app/llm/vector_store/loader/json_loader.py,sha256=qo9ejRZyKv_k6jnGgXnu1W5uqsMMtgqK_uvPpZQ0p74,833
-ws_bom_robot_app-0.0.12.dist-info/METADATA,sha256=2ATPWZDFjdg9vQw3MLBJOXaGUU8f1JgrrlhAOGKQpyw,5678
-ws_bom_robot_app-0.0.12.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ws_bom_robot_app-0.0.12.dist-info/top_level.txt,sha256=Yl0akyHVbynsBX_N7wx3H3ZTkcMLjYyLJs5zBMDAKcM,17
-ws_bom_robot_app-0.0.12.dist-info/RECORD,,
+ws_bom_robot_app-0.0.14.dist-info/METADATA,sha256=XhRlOchK5gvuLSgTvyqIAK13PqvmxEB7puJGQE7YoI8,5859
+ws_bom_robot_app-0.0.14.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ws_bom_robot_app-0.0.14.dist-info/top_level.txt,sha256=Yl0akyHVbynsBX_N7wx3H3ZTkcMLjYyLJs5zBMDAKcM,17
+ws_bom_robot_app-0.0.14.dist-info/RECORD,,