Merge pull request #165 from dataforgoodfr/164_dispatch_space_bytes

[FIX] /dispatch : free space expressed in bytes (#164_dispatch_space_…

Author: broija

.gitignore

@@ -183,4 +183,7 @@ temp/
 
 
 logs/
-output/
+output/
+
+
+dispatcher/api/data/allocations.json

dispatcher/api/data/allocations.json

@@ -80,7 +80,7 @@ def _save_json(file: Path, data: List[Dict]):
 
     @staticmethod
     def _sort_helper(asset: Dict) -> tuple:
-        """Helper function to sort by priority (desc) and size (asc)"""
+        """Helper function to sort by priority (asc) and size (asc)"""
         return (
             asset['priority'],
             asset.get('size', float('inf')) if asset.get('size') is not None else float('inf')
@@ -95,6 +95,7 @@ async def get_available_assets(self) -> List[Dict]:
             try:
                 logger.info("Récupération des assets depuis le priorizer")
                 assets = await self._priorizer_client.get_ranking()
+                logger.info(f"Assets retrieved from ranker: {len(assets)}")
 
                 # Conversion of AssetModel to dictionaries for compatibility
                 result = [asset.model_dump() for asset in assets]
@@ -110,20 +111,23 @@ async def get_available_assets(self) -> List[Dict]:
             logger.info("Utilisation du cache local pour les assets")
             return self._load_json(self.ranker_cache_file)
 
-    async def allocate_assets(self, free_space_mb: float, node_id: str = None) -> Dict:
+    async def allocate_assets(self, free_space: float, node_id: str = None) -> Dict:
         """Priorise et alloue les assets (version multi-allocation)"""
         available = await self.get_available_assets()
         selected = []
-        remaining_space = free_space_mb
-        
-        # Tri par priorité (desc) puis taille (asc)
+        remaining_space = free_space
+        logger.info(f"Free space available: {remaining_space / (1024 * 1024)} GB")
+
+        # Tri par priorité (asc) puis taille (asc)
         for asset in sorted(available, key=self._sort_helper):
             # Asset size may not be known yet
             if asset['size'] is None or asset['size'] <= remaining_space:
                 selected.append(asset)
                 if asset['size'] is not None:
                    remaining_space -= asset['size']
 
+        logger.info(f"Selected {len(selected)} assets")
+        
         if not selected:
             return None
 

dispatcher/api/models/logic.py

@@ -13,7 +13,7 @@ class Status(Enum):
 class DispatchRequest(BaseModel):
     name: str = Field(..., description="Rescuer name")
     description: str = Field(..., description="Rescuer description")
-    free_space_gb: float = Field(..., description="Rescuer available space")
+    free_space: float = Field(..., description="Rescuer available space")
     node_id: Optional[str] = Field(None, description="Node id")
 
 class BaseAssetModel(BaseModel):

dispatcher/api/models/payload.py

@@ -40,7 +40,7 @@ async def dispatch(request: DispatchRequest):
     app_state._logger.info("________In dispatch")
     # Call dispatcher logic with priorizer integration
     result = await app_state._dispatcher.allocate_assets(
-        free_space_mb=request.free_space_gb * 1024,
+        free_space=request.free_space,
         node_id=request.node_id
     )
     app_state._logger.info(result)

dispatcher/api/routers/dispatch.py

@@ -82,7 +82,7 @@ Allocates datasets to a node based on available storage space.
 **Request:**
 ```json
 {
-  "free_space_gb": 10,
+  "free_space": 10,
   "node_id": "node-123"
 }
 ```

priorizer/README.md

@@ -40,7 +40,7 @@ async def ranking():
         asset=result["assets"]
     )
     app_state._logger.info("Priorizer response ready")
-    app_state._logger.info(f"Priorizer response: {priorizer_response}")
+    # app_state._logger.info(f"Priorizer response: {priorizer_response}")
 
     return priorizer_response
 

priorizer/api/routers/priorizer.py

@@ -4,7 +4,7 @@
 payload_mock = {
     "name": "mock_dispatch_request", 
     "description": "This is a test dispatch", 
-    "free_space_gb": 10
+    "free_space": 10
     }
 print(payload_mock)
 response_mock = requests.post(url_mock, json=payload_mock)
@@ -17,7 +17,7 @@
 payload = {
     "name": "test_dispatch_request", 
     "description": "This is a test dispatch", 
-    "free_space_gb": 10,
+    "free_space": 10,
     "node_id": "1"
     }
 print(payload)

test/dispatcher/test_dispatcher.py

@@ -13,7 +13,7 @@
 #payload = {
 #    "name": "test_dispatch_request", 
 #    "description": "This is a test dispatch", 
-#    "free_space_gb": 10,
+#    "free_space": 10,
 #    "node_id": "1"
 #    }
 #print(payload)