flagsmith-common 3.6.0__tar.gz → 3.6.1__tar.gz

{flagsmith_common-3.6.0 → flagsmith_common-3.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flagsmith-common
-Version: 3.6.0
+Version: 3.6.1
 Summary: Flagsmith's common library
 Author: Matthew Elwell, Gagan Trivedi, Kim Gustyr, Zach Aysan, Francesco Lo Franco, Rodrigo López Dato, Evandro Myller, Wadii Zaim
 License-Expression: BSD-3-Clause

{flagsmith_common-3.6.0 → flagsmith_common-3.6.1}/pyproject.toml

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

{flagsmith_common-3.6.0 → flagsmith_common-3.6.1}/src/common/core/main.py

@@ -37,7 +37,24 @@ def ensure_cli_env() -> typing.Generator[None, None, None]:
     """
     ctx = contextlib.ExitStack()
 
+    # Currently we don't install Flagsmith modules as a package, so we need to add
+    # $CWD to the Python path to be able to import them
+    sys.path.append(os.getcwd())
+
+    # TODO @khvn26 We should find a better way to pre-set the Django settings module
+    # without resorting to it being set outside of the application
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.dev")
+
+    if "docgen" in sys.argv:
+        os.environ["DOCGEN_MODE"] = "true"
+
+    if "task-processor" in sys.argv:
+        # A hacky way to signal we're not running the API
+        os.environ["RUN_BY_PROCESSOR"] = "true"
+
     # Set up OTel instrumentation (opt-in via OTEL_EXPORTER_OTLP_ENDPOINT).
+    # Must come after sys.path / DJANGO_SETTINGS_MODULE setup because
+    # DjangoInstrumentor accesses settings.MIDDLEWARE.
     otel_processors = None
     otel_endpoint = env.str("OTEL_EXPORTER_OTLP_ENDPOINT", None)
     if otel_endpoint:
@@ -84,21 +101,6 @@ def ensure_cli_env() -> typing.Generator[None, None, None]:
     if not os.environ.get("PROMETHEUS_MULTIPROC_DIR"):
         os.environ["PROMETHEUS_MULTIPROC_DIR"] = mkdtemp(prefix="flagsmith-prometheus-")
 
-    # Currently we don't install Flagsmith modules as a package, so we need to add
-    # $CWD to the Python path to be able to import them
-    sys.path.append(os.getcwd())
-
-    # TODO @khvn26 We should find a better way to pre-set the Django settings module
-    # without resorting to it being set outside of the application
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.dev")
-
-    if "docgen" in sys.argv:
-        os.environ["DOCGEN_MODE"] = "true"
-
-    if "task-processor" in sys.argv:
-        # A hacky way to signal we're not running the API
-        os.environ["RUN_BY_PROCESSOR"] = "true"
-
     with ctx:
         yield