use exiting setting + pipe it through

wandb · Apr 4, 2024 · c977292 · c977292
1 parent 998841b
commit c977292
Show file tree

Hide file tree

Showing 11 changed files with 82 additions and 69 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -417,7 +417,7 @@ jobs:
     executor: <<parameters.executor>>
 
     environment:
-      WANDB_REQUIRE_CORE: <<parameters.with_core>>
+      WANDB__REQUIRE_CORE: <<parameters.with_core>>
 
     # Shards the job, setting $CIRCLE_NODE_TOTAL and $CIRCLE_NODE_INDEX.
     # https://circleci.com/docs/parallelism-faster-jobs/
@@ -493,7 +493,7 @@ jobs:
     executor: <<parameters.executor>>
 
     environment:
-      WANDB_REQUIRE_CORE: <<parameters.with_core>>
+      WANDB__REQUIRE_CORE: <<parameters.with_core>>
 
     parallelism: 4
 
@@ -630,7 +630,7 @@ jobs:
     environment:
       SHARD: << parameters.shard >>
       COVERAGE_DIR: << parameters.coverage_dir >>
-      WANDB_REQUIRE_CORE: << parameters.with_core >>
+      WANDB__REQUIRE_CORE: << parameters.with_core >>
     parallelism: << parameters.parallelism >>
     resource_class: xlarge
     working_directory: /mnt/ramdisk

diff --git a/core/pkg/service/wandb_settings.pb.go b/core/pkg/service/wandb_settings.pb.go
diff --git a/tox.ini b/tox.ini
@@ -113,6 +113,7 @@ passenv=
     CI_PYTEST_PARALLEL
     CI
     importer-wandb: WANDB_TEST_SERVER_URL2
+    WANDB__REQUIRE_CORE
 allowlist_externals=
     mkdir
     nox
@@ -155,6 +156,7 @@ passenv=
     SHARD
     WANDB_API_KEY
     core: GOCOVERDIR
+    WANDB__REQUIRE_CORE
 allowlist_externals=
     mkdir
     core: nox
@@ -186,6 +188,7 @@ passenv=
 ;    llm: WANDB_API_KEY
     llm: OPENAI_API_KEY
     llm: CO_API_KEY
+    WANDB__REQUIRE_CORE
 allowlist_externals=
     mkdir
 commands_pre=
@@ -208,6 +211,7 @@ passenv=
     USERNAME
     WANDB_API_KEY
     SHARD
+    WANDB__REQUIRE_CORE
 deps=
     yea-wandb=={env:YEA_WANDB_VERSION}
     wheel

diff --git a/wandb/env.py b/wandb/env.py
@@ -87,7 +87,7 @@
 LAUNCH_QUEUE_NAME = "WANDB_LAUNCH_QUEUE_NAME"
 LAUNCH_QUEUE_ENTITY = "WANDB_LAUNCH_QUEUE_ENTITY"
 LAUNCH_TRACE_ID = "WANDB_LAUNCH_TRACE_ID"
-REQUIRE_CORE = "WANDB_REQUIRE_CORE"
+_REQUIRE_CORE = "WANDB__REQUIRE_CORE"
 
 # For testing, to be removed in future version
 USE_V1_ARTIFACTS = "_WANDB_USE_V1_ARTIFACTS"
@@ -148,7 +148,7 @@ def _env_as_bool(
 
 
 def is_require_core(env: Optional[Env] = None) -> bool:
-    return _env_as_bool(REQUIRE_CORE, default="False", env=env)
+    return _env_as_bool(_REQUIRE_CORE, default="False", env=env)
 
 
 def is_debug(default: Optional[str] = None, env: Optional[Env] = None) -> bool: