[impv] Remove tenant define is workflow

current tenant in workflow only work when the first time
user do not exist, when user change the tenant in workflow
but tenant exist, it will be ignore, so we try to remove it
from workflow, and in apache#40 we try to create both user and tenant
vis cli instead of auto create

Author: zhongjiajie

docs/source/concept.rst

@@ -80,11 +80,12 @@ Tenant
 ~~~~~~
 
 Tenant is the user who run task command in machine or in virtual machine. it could be assign by simple string.
+You should change the tenant value to exists tenant in your host, it config in `config.yaml` in your pydolphinscheduler
+``PYDS_HOME``, or via :doc:`CLI <cli>`
 
-.. code-block:: python
+.. code-block:: bash
 
-   # 
-   workflow = Workflow(name="workflow tenant", tenant="tenant_exists")
+   pydolphinscheduler config --set default.user.tenant <YOUR-TENANT-NAME>
 
 .. note::
 

docs/source/config.rst

@@ -101,8 +101,6 @@ All environment variables as below, and you could modify their value via `Bash <
 +------------------+------------------------------------+---------------------------------------------------------------------------------------------------------------------+
 |                  | ``PYDS_WORKFLOW_PROJECT``          | Default workflow project name, will use its value when workflow does not specify the attribute ``project``.         |
 +                  +------------------------------------+---------------------------------------------------------------------------------------------------------------------+
-|                  | ``PYDS_WORKFLOW_TENANT``           | Default workflow tenant, will use its value when workflow does not specify the attribute ``tenant``.                |
-+                  +------------------------------------+---------------------------------------------------------------------------------------------------------------------+
 | Default Workflow | ``PYDS_WORKFLOW_USER``             | Default workflow user, will use its value when workflow does not specify the attribute ``user``.                    |
 +                  +------------------------------------+---------------------------------------------------------------------------------------------------------------------+
 |                  | ``PYDS_WORKFLOW_QUEUE``            | Default workflow queue, will use its value when workflow does not specify the attribute ``queue``.                  |

examples/yaml_define/tutorial.yaml

@@ -20,7 +20,6 @@ workflow:
   name: "tutorial"
   schedule: "0 0 0 * * ? *"
   start_time: "2021-01-01"
-  tenant: "tenant_exists"
   release_state: "offline"
   run: true
 

src/pydolphinscheduler/cli/tenants.py

@@ -0,0 +1,64 @@
+import click
+
+from pydolphinscheduler import configuration
+from pydolphinscheduler.models.tenant import Tenant
+
+
+@click.help_option()
+def tenants() -> click.group:
+    """Users subcommand group."""
+
+
+@click.group()
+def tenants() -> click.group:
+    """Users subcommand group."""
+
+
+@tenants.command()
+@click.option(
+    "-n", "--name", "name",
+    required=True,
+    type=str,
+)
+@click.option(
+    "-q", "--queue-name", "queue_name",
+    required=True,
+    type=str,
+)
+@click.option(
+    "-d", "--description", "description",
+    required=True,
+    type=str,
+)
+def create(name, queue_name, description):
+    tenant = Tenant.get(name)
+    if tenant:
+        click.echo(f"Tenant with name {name} already exists.", err=True)
+    new_tenant = Tenant.create(name, queue_name, description)
+    click.echo(f"Tenant {new_tenant.name} had been created.")
+
+
+@tenants.command()
+@click.option(
+    "-n", "--name", "name",
+    required=True,
+    type=str,
+)
+def delete(name):
+    tenant = Tenant.delete(name)
+    if not tenant:
+        click.echo(f"Tenant with name {name} not exists.", err=True)
+    click.echo(f"Tenant: {tenant}.")
+
+
+@tenants.command()
+@click.option(
+    "-n", "--name", "name",
+    required=True,
+    type=str,
+)
+def get(name):
+    tenant = Tenant.get(name)
+    if not tenant:
+        click.echo(f"Tenant with name {name} not exists.", err=True)
+    click.echo(f"Tenant: {tenant}.")

src/pydolphinscheduler/cli/users.py

@@ -184,6 +184,7 @@ def get_bool(val: Any) -> bool:
     "PYDS_USER_PASSWORD", configs.get("default.user.password")
 )
 USER_EMAIL = os.environ.get("PYDS_USER_EMAIL", configs.get("default.user.email"))
+USER_TENANT = os.environ.get("PYDS_USER_STATE", configs.get("default.user.tenant"))
 USER_PHONE = str(os.environ.get("PYDS_USER_PHONE", configs.get("default.user.phone")))
 USER_STATE = get_int(
     os.environ.get("PYDS_USER_STATE", configs.get("default.user.state"))
@@ -193,9 +194,6 @@ def get_bool(val: Any) -> bool:
 WORKFLOW_PROJECT = os.environ.get(
     "PYDS_WORKFLOW_PROJECT", configs.get("default.workflow.project")
 )
-WORKFLOW_TENANT = os.environ.get(
-    "PYDS_WORKFLOW_TENANT", configs.get("default.workflow.tenant")
-)
 WORKFLOW_USER = os.environ.get(
     "PYDS_WORKFLOW_USER", configs.get("default.workflow.user")
 )

src/pydolphinscheduler/configuration.py

@@ -27,7 +27,7 @@
 from pydolphinscheduler.core.resource_plugin import ResourcePlugin
 from pydolphinscheduler.exceptions import PyDSParamException, PyDSTaskNoFoundException
 from pydolphinscheduler.java_gateway import gateway
-from pydolphinscheduler.models import Base, Project, Tenant, User
+from pydolphinscheduler.models import Base, Project, User
 from pydolphinscheduler.utils.date import MAX_DATETIME, conv_from_str, conv_to_schedule
 
 
@@ -87,7 +87,6 @@ class Workflow(Base):
     _KEY_ATTR = {
         "name",
         "project",
-        "tenant",
         "release_state",
         "param",
     }
@@ -96,7 +95,6 @@ class Workflow(Base):
         "name",
         "description",
         "_project",
-        "_tenant",
         "worker_group",
         "warning_type",
         "warning_group_id",
@@ -120,7 +118,6 @@ def __init__(
         timezone: Optional[str] = configuration.WORKFLOW_TIME_ZONE,
         user: Optional[str] = configuration.WORKFLOW_USER,
         project: Optional[str] = configuration.WORKFLOW_PROJECT,
-        tenant: Optional[str] = configuration.WORKFLOW_TENANT,
         worker_group: Optional[str] = configuration.WORKFLOW_WORKER_GROUP,
         warning_type: Optional[str] = configuration.WORKFLOW_WARNING_TYPE,
         warning_group_id: Optional[int] = 0,
@@ -140,7 +137,6 @@ def __init__(
         self.timezone = timezone
         self._user = user
         self._project = project
-        self._tenant = tenant
         self.worker_group = worker_group
         self.warning_type = warning_type
         if warning_type.strip().upper() not in ("FAILURE", "SUCCESS", "ALL", "NONE"):
@@ -178,16 +174,6 @@ def __enter__(self) -> "Workflow":
     def __exit__(self, exc_type, exc_val, exc_tb) -> None:
         WorkflowContext.delete()
 
-    @property
-    def tenant(self) -> Tenant:
-        """Get attribute tenant."""
-        return Tenant(self._tenant)
-
-    @tenant.setter
-    def tenant(self, tenant: Tenant) -> None:
-        """Set attribute tenant."""
-        self._tenant = tenant.name
-
     @property
     def project(self) -> Project:
         """Get attribute project."""
@@ -204,7 +190,7 @@ def user(self) -> User:
 
         For now we just get from python models but not from java gateway models, so it may not correct.
         """
-        return User(name=self._user, tenant=self._tenant)
+        return User(name=self._user)
 
     @staticmethod
     def _parse_datetime(val: Any) -> Any:
@@ -438,7 +424,6 @@ def submit(self) -> int:
             self.execution_type,
             self.timeout,
             self.worker_group,
-            self._tenant,
             self.release_state,
             # TODO add serialization function
             json.dumps(self.task_relation_json),

src/pydolphinscheduler/core/default_config.yaml

@@ -39,16 +39,15 @@ java_gateway:
 default:
   # Default value for dolphinscheduler's user object
   user:
-    name: userPythonGateway
+    name: userPythonGateway1
     password: userPythonGateway
     email: [email protected]
-    tenant: tenant_pydolphin
+    tenant: zhongjiajie
     phone: 11111111111
     state: 1
   # Default value for dolphinscheduler's workflow object
   workflow:
     project: project-pydolphin
-    tenant: tenant_pydolphin
     user: userPythonGateway
     queue: queuePythonGateway
     worker_group: default

src/pydolphinscheduler/core/workflow.py

@@ -31,8 +31,6 @@
 
 NUM_WORKFLOWS = 10
 NUM_TASKS = 5
-# Make sure your tenant exists in your operator system
-TENANT = "exists_tenant"
 # Whether task should dependent on pre one or not
 # False will create workflow with independent task, while True task will dependent on pre-task and dependence
 # link like `pre_task -> current_task -> next_task`, default True
@@ -41,7 +39,7 @@
 for wf in range(0, NUM_WORKFLOWS):
     workflow_name = f"workflow:{wf}"
 
-    with Workflow(name=workflow_name, tenant=TENANT) as workflow:
+    with Workflow(name=workflow_name) as workflow:
         for t in range(0, NUM_TASKS):
             task_name = f"task:{t}-{workflow_name}"
             command = f"echo This is task {task_name}"