override task config in the begining

Signed-off-by: Nelson Chen <asd3431090@gmail.com>

Author: arbaobao

flytekit/clis/sdk_in_container/run.py

@@ -585,8 +585,8 @@ def run_remote(
         execution = remote.execute(
             entity,
             inputs=inputs,
-            project=remote.default_project or project,
-            domain=remote.default_domain or domain,
+            project=project or remote.default_project,
+            domain=domain or remote.default_domain,
             execution_name=run_level_params.name,
             options=options_from_run_params(run_level_params),
             type_hints=type_hints,

flytekit/clis/sdk_in_container/utils.py

@@ -11,17 +11,20 @@
 from rich.syntax import Syntax
 from rich.traceback import Traceback
 
+from flytekit.configuration import TaskConfig
 from flytekit.core.constants import SOURCE_CODE
 from flytekit.exceptions.base import FlyteException
 from flytekit.exceptions.user import FlyteCompilationException, FlyteInvalidInputException
 from flytekit.exceptions.utils import annotate_exception_with_code
 from flytekit.loggers import get_level_from_cli_verbosity, logger
 
+task_config = TaskConfig.auto()
+
 project_option = click.Option(
     param_decls=["-p", "--project"],
     required=False,
     type=str,
-    default=os.getenv("FLYTE_DEFAULT_PROJECT", "flytesnacks"),
+    default=os.getenv("FLYTE_DEFAULT_PROJECT") or task_config.project,
     show_default=True,
     help="Project to register and run this workflow in. Can also be set through envvar " "``FLYTE_DEFAULT_PROJECT``",
 )
@@ -30,7 +33,7 @@
     param_decls=["-d", "--domain"],
     required=False,
     type=str,
-    default=os.getenv("FLYTE_DEFAULT_DOMAIN", "development"),
+    default=os.getenv("FLYTE_DEFAULT_DOMAIN") or task_config.domain,
     show_default=True,
     help="Domain to register and run this workflow in, can also be set through envvar " "``FLYTE_DEFAULT_DOMAIN``",
 )
@@ -40,7 +43,7 @@
     "--project",
     required=False,
     type=str,
-    default=os.getenv("FLYTE_DEFAULT_PROJECT", "flytesnacks"),
+    default=os.getenv("FLYTE_DEFAULT_PROJECT") or task_config.project,
     show_default=True,
     help="Project for workflow/launchplan. Can also be set through envvar " "``FLYTE_DEFAULT_PROJECT``",
 )
@@ -50,7 +53,7 @@
     "--domain",
     required=False,
     type=str,
-    default=os.getenv("FLYTE_DEFAULT_DOMAIN", "development"),
+    default=os.getenv("FLYTE_DEFAULT_DOMAIN") or task_config.domain,
     show_default=True,
     help="Domain for workflow/launchplan, can also be set through envvar " "``FLYTE_DEFAULT_DOMAIN``",
 )

flytekit/configuration/__init__.py

@@ -669,8 +669,8 @@ class TaskConfig(object):
     Any Project/Domain/Org configuration.
     """
 
-    project: Optional[str] = None
-    domain: Optional[str] = None
+    project: Optional[str] = "flytesnacks"
+    domain: Optional[str] = "development"
     org: Optional[str] = None
 
     @classmethod
@@ -699,15 +699,13 @@ class Config(object):
         stats (StatsConfig): Configuration for statsd metrics.
         data_config (DataConfig): Data storage configuration.
         local_sandbox_path (str): Path for local sandbox runs.
-        task_config (TaskConfig): Project/Domain/Org configuration.
     """
 
     platform: PlatformConfig = PlatformConfig()
     secrets: SecretsConfig = SecretsConfig()
     stats: StatsConfig = StatsConfig()
     data_config: DataConfig = DataConfig()
     local_sandbox_path: str = tempfile.mkdtemp(prefix="flyte")
-    task_config: TaskConfig = TaskConfig()
 
     def with_params(
         self,
@@ -716,15 +714,13 @@ def with_params(
         stats: StatsConfig = None,
         data_config: DataConfig = None,
         local_sandbox_path: str = None,
-        task_config: TaskConfig = None,
     ) -> Config:
         return Config(
             platform=platform or self.platform,
             secrets=secrets or self.secrets,
             stats=stats or self.stats,
             data_config=data_config or self.data_config,
             local_sandbox_path=local_sandbox_path or self.local_sandbox_path,
-            task_config=task_config or self.task_config,
         )
 
     @classmethod
@@ -746,7 +742,6 @@ def auto(cls, config_file: typing.Union[str, ConfigFile, None] = None) -> Config
             secrets=SecretsConfig.auto(config_file),
             stats=StatsConfig.auto(config_file),
             data_config=DataConfig.auto(config_file),
-            task_config=TaskConfig.auto(config_file),
             **kwargs,
         )
 

flytekit/remote/remote.py

@@ -308,10 +308,6 @@ def __init__(
         # read config files, env vars, host, ssl options for admin client
         self._default_project = default_project
         self._default_domain = default_domain
-        if config.task_config.project is not None:
-            self._default_project = config.task_config.project
-        if config.task_config.domain is not None:
-            self._default_domain = config.task_config.domain
 
         fsspec.register_implementation("flyte", get_flyte_fs(remote=self), clobber=True)