Add --tier option to create job and cronjob commands (#49)

Author: erick-GeGe

estela_cli/create/cronjob.py

@@ -40,14 +40,20 @@
     callback=set_tag_format,
     help="Set spider cronjob tag (may have multiple)",
 )
+@click.option(
+    "--tier",
+    "-r",
+    type=click.Choice(["TINY", "XSMALL", "SMALL", "MEDIUM", "LARGE", "XLARGE", "HUGE", "XHUGE"]),
+    help="Set spider cronjob resource tier",
+)
 @click.option(
     "--day",
     "-d",
     type=click.INT,
     callback=validate_positive,
     help="Set spider cronjob data expiry days",
 )
-def estela_command(sid, pid, schedule, arg, env, tag, day):
+def estela_command(sid, pid, schedule, arg, env, tag, tier, day):
     """Create a new cronjob
 
     \b
@@ -67,7 +73,7 @@ def estela_command(sid, pid, schedule, arg, env, tag, day):
             )
     try:
         response = estela_client.create_spider_cronjob(
-            pid, sid, schedule, arg, env, tag, day
+            pid, sid, schedule, arg, env, tag, tier, day
         )
         click.echo("cronjob/{} created.".format(response["name"]))
     except Exception as ex:

estela_cli/create/job.py

@@ -39,14 +39,20 @@
     callback=set_tag_format,
     help="Set spider job tag (may have multiple)",
 )
+@click.option(
+    "--tier",
+    "-r",
+    type=click.Choice(["TINY", "XSMALL", "SMALL", "MEDIUM", "LARGE", "XLARGE", "HUGE", "XHUGE"]),
+    help="Set spider job resource tier",
+)
 @click.option(
     "--day",
     "-d",
     type=click.INT,
     callback=validate_positive,
     help="Set spider job data expiry days",
 )
-def estela_command(sid, pid, arg, env, tag, day):
+def estela_command(sid, pid, arg, env, tag, tier, day):
     """Create a new job
 
     \b
@@ -64,7 +70,7 @@ def estela_command(sid, pid, arg, env, tag, day):
                 "No active project in the current directory. Please specify the PID."
             )
     try:
-        response = estela_client.create_spider_job(pid, sid, arg, env, tag, day)
+        response = estela_client.create_spider_job(pid, sid, arg, env, tag, tier, day)
         click.echo("job/{} created.".format(response["name"]))
     except Exception as ex:
         raise click.ClickException("Cannot create the job for given SID and PID.")

estela_cli/estela_client.py

@@ -1,4 +1,3 @@
-from datetime import date, timedelta
 from pathlib import Path
 
 import requests
@@ -241,16 +240,18 @@ def get_spider_job_data(self, pid, sid, jid, datatype, last_chunk=None):
         self.check_status(response, 200)
         return response.json()
 
-    def create_spider_job(self, pid, sid, args=[], env_vars=[], tags=[], day=None):
+    def create_spider_job(self, pid, sid, args=[], env_vars=[], tags=[], tier=None, day=None):
         endpoint = "projects/{}/spiders/{}/jobs".format(pid, sid)
         data = {
             "args": args,
             "env_vars": env_vars,
             "tags": tags,
             "data_status": "PENDING" if day else "PERSISTENT",
         }
+        if tier:
+            data["resource_tier"] = tier
         if day:
-            data["data_expiry_days"] = f"{date.today() + timedelta(days=day)}"
+            data["data_expiry_days"] = day
 
         response = self.post(endpoint, data=data)
         self.check_status(response, 201)
@@ -263,7 +264,7 @@ def stop_spider_job(self, pid, sid, jid):
         return response.json()
 
     def create_spider_cronjob(
-        self, pid, sid, schedule="", args=[], env_vars=[], tags=[], day=None
+        self, pid, sid, schedule="", args=[], env_vars=[], tags=[], tier=None, day=None
     ):
         endpoint = "projects/{}/spiders/{}/cronjobs".format(pid, sid)
         data = {
@@ -272,9 +273,10 @@ def create_spider_cronjob(
             "cenv_vars": env_vars,
             "ctags": tags,
             "data_status": "PENDING" if day else "PERSISTENT",
+            "data_expiry_days": day if day else 1,
         }
-        if day:
-            data["data_expiry_days"] = f"0/{day}"
+        if tier:
+            data["resource_tier"] = tier
 
         response = self.post(endpoint, data=data)
         self.check_status(response, 201)

estela_cli/list/cronjob.py

@@ -62,9 +62,10 @@ def estela_command(sid, pid, tag):
             format_tags(cronjob["ctags"]),
             format_key_value_pairs(cronjob["cargs"]),
             format_key_value_pairs(cronjob["cenv_vars"]),
+            cronjob.get("resource_tier", ""),
         ]
         for cronjob in cronjobs
     ]
 
-    headers = ["CJID", "STATUS", "SCHEDULE", "TAGS", "ARGS", "ENV VARS"]
+    headers = ["CJID", "STATUS", "SCHEDULE", "TAGS", "ARGS", "ENV VARS", "RESOURCE TIER"]
     click.echo(tabulate(cronjobs, headers, numalign="left", tablefmt="plain"))

estela_cli/list/job.py

@@ -71,10 +71,11 @@ def estela_command(sid, pid, tag, page):
             format_tags(job["tags"]),
             format_key_value_pairs(job["args"]),
             format_key_value_pairs(job["env_vars"]),
+            job.get("resource_tier", ""),
             format_time(job["created"]),
         ]
         for job in jobs
     ]
 
-    headers = ["JID", "STATUS", "TAGS", "ARGS", "ENV VARS", "CREATED"]
+    headers = ["JID", "STATUS", "TAGS", "ARGS", "ENV VARS", "RESOURCE TIER", "CREATED"]
     click.echo(tabulate(jobs, headers, numalign="left", tablefmt="plain"))