flagsmith-common 2.2.3__tar.gz → 2.2.5__tar.gz

{flagsmith_common-2.2.3 → flagsmith_common-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flagsmith-common
-Version: 2.2.3
+Version: 2.2.5
 Summary: Flagsmith's common library
 License-Expression: BSD-3-Clause
 License-File: LICENSE

{flagsmith_common-2.2.3 → flagsmith_common-2.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flagsmith-common"
-version = "2.2.3"
+version = "2.2.5"
 description = "Flagsmith's common library"
 requires-python = ">=3.11,<4.0"
 dependencies = [

flagsmith_common-2.2.5/src/common/core/constants.py

@@ -0,0 +1 @@
+DEFAULT_PROMETHEUS_MULTIPROC_DIR = "/tmp/flagsmith-prometheus"

{flagsmith_common-2.2.3 → flagsmith_common-2.2.5}/src/common/core/main.py

@@ -1,16 +1,16 @@
 import contextlib
 import logging
 import os
+import shutil
 import sys
 import typing
 
 from django.core.management import (
     execute_from_command_line as django_execute_from_command_line,
 )
-from environs import Env
 
 from common.core.cli import healthcheck
-from common.core.utils import TemporaryDirectory
+from common.core.constants import DEFAULT_PROMETHEUS_MULTIPROC_DIR
 
 logger = logging.getLogger(__name__)
 
@@ -31,7 +31,6 @@ def ensure_cli_env() -> typing.Generator[None, None, None]:
         main()
     ```
     """
-    env = Env()
     ctx = contextlib.ExitStack()
 
     # TODO @khvn26 Move logging setup to here
@@ -45,16 +44,16 @@ def ensure_cli_env() -> typing.Generator[None, None, None]:
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.dev")
 
     # Set up Prometheus' multiprocess mode
-    if not env.str("PROMETHEUS_MULTIPROC_DIR", ""):
-        delete = not env.bool("PROMETHEUS_MULTIPROC_DIR_KEEP", False)
-        prometheus_multiproc_dir_name = ctx.enter_context(
-            TemporaryDirectory(delete=delete)
-        )
-        logger.info(
-            "Created %s for Prometheus multi-process mode",
-            prometheus_multiproc_dir_name,
-        )
-        os.environ["PROMETHEUS_MULTIPROC_DIR"] = prometheus_multiproc_dir_name
+    prometheus_multiproc_dir_name = os.environ.setdefault(
+        "PROMETHEUS_MULTIPROC_DIR",
+        DEFAULT_PROMETHEUS_MULTIPROC_DIR,
+    )
+    shutil.rmtree(prometheus_multiproc_dir_name, ignore_errors=True)
+    os.makedirs(prometheus_multiproc_dir_name, exist_ok=True)
+    logger.info(
+        "Re-created %s for Prometheus multi-process mode",
+        prometheus_multiproc_dir_name,
+    )
 
     if "docgen" in sys.argv:
         os.environ["DOCGEN_MODE"] = "true"

{flagsmith_common-2.2.3 → flagsmith_common-2.2.5}/src/common/core/utils.py

@@ -2,11 +2,10 @@ import json
 import logging
 import pathlib
 import random
-import sys
-import tempfile
 from functools import lru_cache
 from itertools import cycle
 from typing import (
+    TYPE_CHECKING,
     Iterator,
     Literal,
     NotRequired,
@@ -17,19 +16,23 @@ from typing import (
 
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from django.contrib.auth.models import AbstractBaseUser
 from django.db import connections
-from django.db.models import Manager, Model
 from django.db.utils import OperationalError
 
 from common.core import ReplicaReadStrategy
 
+if TYPE_CHECKING:
+    from django.contrib.auth.models import AbstractBaseUser
+    from django.db.models.base import Model
+    from django.db.models.manager import Manager
+
+
 logger = logging.getLogger(__name__)
 
 UNKNOWN = "unknown"
 VERSIONS_INFO_FILE_LOCATION = ".versions.json"
 
-ManagerType = TypeVar("ManagerType", bound=Manager[Model])
+ManagerType = TypeVar("ManagerType", bound="Manager[Model]")
 
 ReplicaNamePrefix = Literal["replica_", "cross_region_replica_"]
 _replica_sequential_names_by_prefix: dict[ReplicaNamePrefix, Iterator[str]] = {}
@@ -102,7 +105,7 @@ def get_version_info() -> VersionInfo:
     version_json["image_tag"] = manifest_versions["."]
 
     if not _is_saas:
-        user_objects: Manager[AbstractBaseUser] = getattr(get_user_model(), "objects")
+        user_objects: "Manager[AbstractBaseUser]" = getattr(get_user_model(), "objects")
 
         version_json["self_hosted_data"] = {
             "has_users": user_objects.exists(),
@@ -195,40 +198,3 @@ def using_database_replica(
         return manager
 
     return manager.db_manager(chosen_replica)
-
-
-if sys.version_info >= (3, 12):
-    # Already has the desired behavior; re-export for uniform imports.
-    TemporaryDirectory = tempfile.TemporaryDirectory
-else:
-    import contextlib
-    from typing import ContextManager, Generator
-
-    def TemporaryDirectory(
-        suffix: str | None = None,
-        prefix: str | None = None,
-        dir: str | None = None,
-        *,
-        delete: bool = True,
-    ) -> ContextManager[str]:
-        """
-        Create a temporary directory with optional cleanup control.
-
-        This wrapper exists because Python 3.12 changed TemporaryDirectory's behavior
-        by adding a 'delete' parameter, which doesn't exist in Python 3.11. This
-        function provides a consistent API across both versions.
-
-        When delete=True, uses the stdlib's TemporaryDirectory (auto-cleanup).
-        When delete=False, creates a directory with mkdtemp that persists after
-        the context manager exits, matching Python 3.12's delete=False behavior.
-
-        See https://docs.python.org/3.12/library/tempfile.html#tempfile.TemporaryDirectory for usage details.
-        """
-        if delete:
-            return tempfile.TemporaryDirectory(suffix, prefix, dir)
-
-        @contextlib.contextmanager
-        def _tmpdir() -> Generator[str, None, None]:
-            yield tempfile.mkdtemp(suffix, prefix, dir)
-
-        return _tmpdir()