fix ci auth issues (#3320)

Author: lhoestq

.github/workflows/_e2e_tests.yml

@@ -53,7 +53,7 @@ jobs:
           MONGO_PORT: ${{ env.mongo-port }}
           MONGO_REPLICASET: ${{ env.replicaset }}
           COMMON_BLOCKED_DATASETS: "DVUser/blocked-*"
-          ADMIN_HF_ORGANIZATION: "valid_org"
+          ADMIN_HF_ORGANIZATION: "DVAdminsOrg"
           E2E_ADMIN_USER_TOKEN: "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"
           # the containers need to access S3 and Cloudfront
           ASSETS_BASE_URL: "https://datasets-server-test.us.dev.moon.huggingface.tech/assets"
@@ -110,7 +110,7 @@ jobs:
           PROMETHEUS_MULTIPROC_DIR: "/tmp"
           WORKER_SLEEP_SECONDS: "1"
           COMMON_BLOCKED_DATASETS: "DVUser/blocked-*"
-          ADMIN_HF_ORGANIZATION: "valid_org"
+          ADMIN_HF_ORGANIZATION: "DVAdminsOrg"
           E2E_ADMIN_USER_TOKEN: "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"
         run: |
           poetry run python -m pytest -vv -s tests

e2e/Makefile

@@ -28,7 +28,7 @@ export WORKER_UVICORN_NUM_WORKERS := 2
 export WORKER_UVICORN_PORT := 9086
 
 # see https://github.com/huggingface/moon-landing/blob/main/server/scripts/staging-seed-db.ts
-export ADMIN_HF_ORGANIZATION := valid_org
+export ADMIN_HF_ORGANIZATION := DVAdminsOrg
 export E2E_ADMIN_USER_TOKEN := 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
 
 export COMPOSE_PROJECT_NAME := e2e

libs/libapi/tests/test_utils.py

@@ -229,7 +229,7 @@ def test_get_cache_entry_from_step_no_cache_private_enterprise(hf_endpoint: str)
                 id=dataset, sha=revision, private=True, downloads=0, likes=0, tags=[], author=author
             ),
         ),
-        patch("libcommon.operations.get_entity_info", return_value=EntityInfo(isPro=False, isEnterprise=True)),
+        patch("libcommon.operations.get_entity_info", return_value=EntityInfo(isPro=False, plan="enterprise")),
     ):
         # ^ the dataset and the author do not exist on the Hub, we don't want to raise an issue here
         with raises(ResponseNotReadyError):

libs/libcommon/src/libcommon/operations.py

@@ -56,7 +56,7 @@ class EntityInfo:
 
     def __init__(self, **kwargs) -> None:  # type: ignore
         self.is_pro = kwargs.pop("isPro", None)
-        self.is_enterprise = True if kwargs.pop("plan", None) is not None else False
+        self.is_enterprise = kwargs["plan"] is not None if "plan" in kwargs else None
 
 
 class CustomHfApi(HfApi):

libs/libcommon/tests/test_operations.py

@@ -74,7 +74,7 @@ def test_get_revision_timeout() -> None:
     [
         (NORMAL_USER, False, None),
         (PRO_USER, True, None),
-        (NORMAL_ORG, None, False),
+        (NORMAL_ORG, None, None),
         (ENTERPRISE_ORG, None, True),
     ],
 )