add support for -n in log

Author: PacificDou

roboflow/adapters/deploymentapi.py

@@ -57,8 +57,8 @@ def list_machine_types(api_key):
     return response.status_code, response.json()
 
 
-def get_deployment_log(api_key, deployment_name, from_timestamp=None, to_timestamp=None):
-    url = f"{DEDICATED_DEPLOYMENT_URL}/get_log?api_key={api_key}&deployment_name={deployment_name}"
+def get_deployment_log(api_key, deployment_name, max_entries, from_timestamp=None, to_timestamp=None):
+    url = f"{DEDICATED_DEPLOYMENT_URL}/get_log?api_key={api_key}&deployment_name={deployment_name}&max_entries={max_entries}"
     if from_timestamp is not None:
         url += f"&from_timestamp={from_timestamp.isoformat()}"
     if to_timestamp is not None:

roboflow/deployment.py

@@ -74,6 +74,7 @@ def add_deployment_parser(subparsers):
     deployment_log_parser.add_argument("-a", "--api_key", help="api key")
     deployment_log_parser.add_argument("deployment_name", help="deployment name")
     deployment_log_parser.add_argument("-d", "--duration", help="duration of log (from now) in seconds", type=int, default=3600)
+    deployment_log_parser.add_argument("-n", "--tail", help="number of lines to show from the end of the logs (<= 50)", type=int, default=10)
     deployment_log_parser.add_argument(
         "-f", "--follow", help="follow log output", action="store_true"
     )
@@ -83,19 +84,19 @@ def list_machine_types(args):
     api_key = args.api_key or load_roboflow_api_key(None)
     if api_key is None:
         print("Please provide an api key")
-        return
+        exit(1)
     status_code, msg = deploymentapi.list_machine_types(api_key)
     if status_code != 200:
         print(f"{status_code}: {msg}")
-        return
+        exit(status_code)
     print(json.dumps(msg, indent=2))
 
 
 def add_deployment(args):
     api_key = args.api_key or load_roboflow_api_key(None)
     if api_key is None:
         print("Please provide an api key")
-        return
+        exit(1)
     status_code, msg = deploymentapi.add_deployment(
         api_key,
         # args.security_level,
@@ -108,7 +109,7 @@ def add_deployment(args):
 
     if status_code != 200:
         print(f"{status_code}: {msg}")
-        return
+        exit(status_code)
     else:
         print(f"Deployment {args.deployment_name} created successfully")
         print(json.dumps(msg, indent=2))
@@ -121,12 +122,12 @@ def get_deployment(args):
     api_key = args.api_key or load_roboflow_api_key(None)
     if api_key is None:
         print("Please provide an api key")
-        return
+        exit(1)
     while True:
         status_code, msg = deploymentapi.get_deployment(api_key, args.deployment_name)
         if status_code != 200:
             print(f"{status_code}: {msg}")
-            return
+            exit(status_code)
 
         if (not args.wait_on_pending) or msg["status"] != "pending":
             print(json.dumps(msg, indent=2))
@@ -140,40 +141,40 @@ def list_deployment(args):
     api_key = args.api_key or load_roboflow_api_key(None)
     if api_key is None:
         print("Please provide an api key")
-        return
+        exit(1)
     status_code, msg = deploymentapi.list_deployment(api_key)
     if status_code != 200:
         print(f"{status_code}: {msg}")
-        return
+        exit(status_code)
     print(json.dumps(msg, indent=2))
 
 
 def delete_deployment(args):
     api_key = args.api_key or load_roboflow_api_key(None)
     if api_key is None:
         print("Please provide an api key")
-        return
+        exit(1)
     status_code, msg = deploymentapi.delete_deployment(api_key, args.deployment_name)
     if status_code != 200:
         print(f"{status_code}: {msg}")
-        return
+        exit(status_code)
     print(json.dumps(msg, indent=2))
 
 
 def get_deployment_log(args):
     api_key = args.api_key or load_roboflow_api_key(None)
     if api_key is None:
         print("Please provide an api key")
-        return
+        exit(1)
 
     to_timestamp = datetime.now()
     from_timestamp = (to_timestamp - timedelta(seconds = args.duration))
     log_ids = set() # to avoid duplicate logs
     while True:
-        status_code, msg = deploymentapi.get_deployment_log(api_key, args.deployment_name, from_timestamp, to_timestamp)
+        status_code, msg = deploymentapi.get_deployment_log(api_key, args.deployment_name, args.tail, from_timestamp, to_timestamp)
         if status_code != 200:
             print(f"{status_code}: {msg}")
-            return
+            exit(status_code)
 
         for log in msg[::-1]: # logs are sorted by reversed timestamp
             if log['insert_id'] in log_ids: