qalita 2.6.3__py3-none-any.whl → 2.8.1__py3-none-any.whl

qalita/commands/worker.py

@@ -32,14 +32,14 @@ ROUTINE_LAST_SCHEDULED_UTC = {}
 @click.option(
     "-n",
     "--name",
-    help="The name of the agent, it will be used to identify the agent in the qalita platform",
+    help="The name of the worker, it will be used to identify the worker in the qalita platform",
     envvar="QALITA_WORKER_NAME",
 )
 @click.option(
     "-m",
     "--mode",
     type=click.Choice(["job", "worker"], case_sensitive=False),
-    help="The mode of the agent, <worker/job> if you run the agent in worker mode, the agent will loop until it gets a job to do, in job mode it will immediately do a job",
+    help="The mode of the worker, <worker/job> if you run the worker in worker mode, the worker will loop until it gets a job to do, in job mode it will immediately do a job",
     envvar="QALITA_WORKER_MODE",
 )
 @click.option(
@@ -51,7 +51,7 @@ ROUTINE_LAST_SCHEDULED_UTC = {}
 @click.option(
     "-u",
     "--url",
-    help="The URL to the qalita backend the agent have to register exemple : http://backend:3080",
+    help="The URL to the qalita backend the worker have to register exemple : http://backend:3080",
     envvar="QALITA_WORKER_ENDPOINT",
 )
 @pass_config
@@ -96,13 +96,13 @@ def worker(config, name, mode, token, url):
     if not name:
         logger.error("Error: Worker name is required!")
         logger.info("\tTo do so, you can set an Environment Variable : ")
-        logger.info("\t\texport QALITA_WORKER_NAME='agent-1'")
+        logger.info("\t\texport QALITA_WORKER_NAME='worker-1'")
         logger.info("\tor add the name as a commandline argument : ")
-        logger.info("\t\tqalita worker --name 'agent-1'")
+        logger.info("\t\tqalita worker --name 'worker-1'")
         logger.info(
             "\tthe prefered way is to create a file '.env-file' with the values : "
         )
-        logger.info("\t\tQALITA_WORKER_NAME=agent-1")
+        logger.info("\t\tQALITA_WORKER_NAME=worker-1")
         logger.info("\tand source it : ")
         logger.info("\t\texport $(xargs < .env-file)")
         all_check_pass = False
@@ -137,7 +137,7 @@ def worker(config, name, mode, token, url):
         logger.info("\tTo do so, you can set an Environment Variable : ")
         logger.info("\t\texport QALITA_WORKER_ENDPOINT='http://localhost:3080'")
         logger.info("\tor add the url as a commandline argument : ")
-        logger.info("\t\tqalita worker --url 'agent-1'")
+        logger.info("\t\tqalita worker --url 'http://localhost:3080'")
         logger.info(
             "\tthe prefered way is to create a file '.env-file' with the values : "
         )
@@ -250,9 +250,9 @@ def authenticate(config, user_id):
         )
 
         if agent_exists:
-            logger.success(f"Agent '{config.name}' is already registered.")
+            logger.success(f"Worker '{config.name}' is already registered.")
         else:
-            logger.info(f"Agent '{config.name}' is not registered. Registering now...")
+            logger.info(f"Worker '{config.name}' is not registered. Registering now...")
 
             # Enregistrement de l'agent
             try:
@@ -280,7 +280,7 @@ def authenticate(config, user_id):
                 )
 
             if r.status_code == 201:
-                logger.success(f"Agent '{config.name}' successfully registered.")
+                logger.success(f"Worker '{config.name}' successfully registered.")
 
                 # Fetch the full list again
                 try:
@@ -290,12 +290,12 @@ def authenticate(config, user_id):
 
                 if r.status_code != 200:
                     logger.error(
-                        f"Failed to retrieve updated agent list - HTTP Code: {r.status_code}"
+                        f"Failed to retrieve updated worker list - HTTP Code: {r.status_code}"
                     )
                     sys.exit(1)
             else:
                 logger.error(
-                    f"Failed to register agent '{config.name}' - HTTP Code: {r.status_code} - {r.text}"
+                    f"Failed to register worker '{config.name}' - HTTP Code: {r.status_code} - {r.text}"
                 )
                 sys.exit(1)
 
@@ -404,10 +404,16 @@ def login(config):
     help="The pack Version to run the job against, to get the pack version, run qalita pack -p <pack_id> versions, default to latest",
     envvar="QALITA_WORKER_JOB_PACK_VERSION",
 )
+@click.option(
+    "--grpc/--no-grpc",
+    default=True,
+    help="Use gRPC for real-time bidirectional communication (default: enabled). Use --no-grpc to fall back to REST polling.",
+    envvar="QALITA_WORKER_GRPC",
+)
 def run(
-    config, source_id, source_version, target_id, target_version, pack_id, pack_version
+    config, source_id, source_version, target_id, target_version, pack_id, pack_version, grpc
 ):
-    """Runs de agent"""
+    """Runs the worker"""
     # Pre-checks
     if config.mode == "job":
         if source_id is None:
@@ -424,10 +430,24 @@ def run(
             )
             logger.error("To get the pack ID, run qalita pack list")
             sys.exit(1)
+    # Use gRPC mode if enabled and in worker mode
+    if grpc and config.mode == "worker":
+        logger.info("------------- Worker Run (gRPC mode) -------------")
+        import asyncio
+        try:
+            from qalita.commands.worker_grpc import run_worker_grpc
+            asyncio.run(run_worker_grpc(config, config.name, config.mode, config.token, config.url))
+            return
+        except ImportError as e:
+            logger.warning(f"gRPC not available, falling back to REST: {e}")
+        except Exception as e:
+            logger.error(f"gRPC mode failed, falling back to REST: {e}")
+    
+    # REST mode (legacy)
     logger.info("------------- Worker Authenticate -------------")
     validated_info = validate_token(config.token)
     authenticate(validated_info["user_id"])
-    logger.info("------------- Worker Run -------------")
+    logger.info("------------- Worker Run (REST mode) -------------")
     agent_conf = config.load_worker_config()
     logger.info(f"Worker ID : {agent_conf['context']['remote']['id']}")
     logger.info(f"Worker Mode : {config.mode}")
@@ -506,11 +526,11 @@ def run(
                     time.sleep(60)
         except KeyboardInterrupt:
             logger.warning("KILLSIG detected. Gracefully exiting the program.")
-            logger.error("Set Agent OFFLINE...")
+            logger.error("Set Worker OFFLINE...")
             send_alive(config_file=agent_conf, status="offline")
             logger.error("Exit")
     else:
-        logger.error("Agent mode not supported : <worker/job>")
+        logger.error("Worker mode not supported : <worker/job>")
         sys.exit(1)
 
 
@@ -655,8 +675,11 @@ def job_run(
             )
             source_version = latest_version["sem_ver_id"]
             source_version_id = latest_version["id"]
-    if response_source.status_code == 204:
-        logger.error(f"Source with id {source_id} not found, source doesn't exist or you don't have the permission to access it. \nAgent is [{agent_conf['context']['remote']['name']}] You may need to change agent.")
+        elif source_version_id is None:
+            logger.error(f"Source with id {source_id} has no versions. Cannot proceed without a source version.")
+            sys.exit(1)
+    elif response_source.status_code == 204:
+        logger.error(f"Source with id {source_id} not found, source doesn't exist or you don't have the permission to access it. \nWorker is [{agent_conf['context']['remote']['name']}] You may need to change worker.")
         sys.exit(1)
 
     logger.info(
@@ -676,8 +699,11 @@ def job_run(
             )
             pack_version = latest_version["sem_ver_id"]
             pack_version_id = latest_version["id"]
+        elif pack_version_id is None:
+            logger.error(f"Pack with id {pack_id} has no versions. Cannot proceed without a pack version.")
+            sys.exit(1)
     elif response_pack.status_code == 204:
-        logger.error(f"Pack with id {pack_id} not found, pack doesn't exist or you don't have the permission to access it. \nAgent is [{agent_conf['context']['remote']['name']}] You may need to change agent.")
+        logger.error(f"Pack with id {pack_id} not found, pack doesn't exist or you don't have the permission to access it. \nWorker is [{agent_conf['context']['remote']['name']}] You may need to change worker.")
         sys.exit(1)
 
     logger.info(f"pack version not specified, Latest pack version is {pack_version}")