flagsmith-common 2.2.6__tar.gz → 3.0.0__tar.gz

{flagsmith_common-2.2.6 → flagsmith_common-3.0.0}/PKG-INFO

@@ -1,44 +1,43 @@
 Metadata-Version: 2.4
 Name: flagsmith-common
-Version: 2.2.6
+Version: 3.0.0
 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
 License-File: LICENSE
-Author: Matthew Elwell
-Maintainer: Flagsmith Team
-Maintainer-email: support@flagsmith.com
-Requires-Python: >=3.11,<4.0
 Classifier: Framework :: Django
 Classifier: Framework :: Pytest
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
-Provides-Extra: test-tools
-Requires-Dist: backoff (>=2.2.1,<3.0.0)
-Requires-Dist: django (>4,<5)
-Requires-Dist: django-health-check
-Requires-Dist: djangorestframework
-Requires-Dist: djangorestframework-recursive
-Requires-Dist: drf-writable-nested
-Requires-Dist: drf-yasg (>=1.21.10,<2.0.0)
-Requires-Dist: environs (<15)
-Requires-Dist: flagsmith-flag-engine
-Requires-Dist: gunicorn (>=19.1)
-Requires-Dist: prometheus-client (>=0.0.16)
-Requires-Dist: psycopg2-binary (>=2.9,<3)
-Requires-Dist: pyfakefs (>=5,<6) ; extra == "test-tools"
-Requires-Dist: pytest-django (>=4,<5) ; extra == "test-tools"
-Requires-Dist: requests
-Requires-Dist: simplejson (>=3,<4)
+Requires-Dist: django>4,<6 ; extra == 'common-core'
+Requires-Dist: django-health-check ; extra == 'common-core'
+Requires-Dist: djangorestframework-recursive ; extra == 'common-core'
+Requires-Dist: djangorestframework ; extra == 'common-core'
+Requires-Dist: drf-writable-nested ; extra == 'common-core'
+Requires-Dist: drf-yasg>=1.21.10,<2.0.0 ; extra == 'common-core'
+Requires-Dist: environs<15 ; extra == 'common-core'
+Requires-Dist: gunicorn>=19.1 ; extra == 'common-core'
+Requires-Dist: prometheus-client>=0.0.16 ; extra == 'common-core'
+Requires-Dist: psycopg2-binary>=2.9,<3 ; extra == 'common-core'
+Requires-Dist: requests ; extra == 'common-core'
+Requires-Dist: simplejson>=3,<4 ; extra == 'common-core'
+Requires-Dist: backoff>=2.2.1,<3.0.0 ; extra == 'task-processor'
+Requires-Dist: django>4,<6 ; extra == 'task-processor'
+Requires-Dist: django-health-check ; extra == 'task-processor'
+Requires-Dist: prometheus-client>=0.0.16 ; extra == 'task-processor'
+Requires-Dist: pyfakefs>=5,<6 ; extra == 'test-tools'
+Requires-Dist: pytest-django>=4,<5 ; extra == 'test-tools'
+Maintainer: Flagsmith Team
+Maintainer-email: Flagsmith Team <support@flagsmith.com>
+Requires-Python: >=3.11, <4.0
 Project-URL: Changelog, https://github.com/flagsmith/flagsmith-common/blob/main/CHANGELOG.md
 Project-URL: Download, https://github.com/flagsmith/flagsmith-common/releases
 Project-URL: Homepage, https://flagsmith.com
 Project-URL: Issues, https://github.com/flagsmith/flagsmith-common/issues
 Project-URL: Repository, https://github.com/flagsmith/flagsmith-common
+Provides-Extra: common-core
+Provides-Extra: task-processor
+Provides-Extra: test-tools
 Description-Content-Type: text/markdown
 
 # flagsmith-common
@@ -47,54 +46,28 @@ Description-Content-Type: text/markdown
 
 Flagsmith's common library
 
-### Development Setup
+## Local development
 
-This project uses [Poetry](https://python-poetry.org/) for dependency management and includes a Makefile to simplify common development tasks.
+The project assumes the following tools installed:
 
-#### Prerequisites
+- [uv](https://github.com/astral-sh/uv)
+- [GNU Make](https://www.gnu.org/software/make/)
 
-- Python >= 3.11
-- Make
+To list available Makefile targets, run `make help`.
 
-#### Installation
+To set up local development environment, run `make install`.
 
-You can set up your development environment using the provided Makefile:
+To run linters, run `make lint`.
 
-```bash
-# Install everything (pip, poetry, and project dependencies)
-make install
+To run tests, run `make test`.
 
-# Individual installation steps are also available
-make install-pip       # Upgrade pip
-make install-poetry    # Install Poetry
-make install-packages  # Install project dependencies
-```
-
-#### Development
+## Usage
 
-Run linting checks using pre-commit:
-
-```bash
-make lint
-```
+### Installation
 
-Additional options can be passed to the `install-packages` target:
+1. Install all runtime packages: `uv add flagsmith-common[common-core,task-processor]`
 
-```bash
-# Install with development dependencies
-make install-packages opts="--with dev"
-
-# Install with specific extras
-make install-packages opts="--extras 'feature1 feature2'"
-```
-
-### Usage
-
-#### Installation
-
-1. `poetry add flagsmith-common`
-
-2. `poetry add --G dev flagsmith-common[test-tools]` — this will enable the Pytest fixtures. Skipping this step will make Pytest collection fail due to missing dependencies.
+2. To enable the Pytest fixtures, run `uv add --G dev flagsmith-common[test-tools]`. Skipping this step will make Pytest collection fail due to missing dependencies.
 
 3. Make sure `"common.core"` is in the `INSTALLED_APPS` of your settings module.
 This enables the `manage.py flagsmith` commands.
@@ -104,11 +77,11 @@ This enables the `route` label for Prometheus HTTP metrics.
 
 5. To enable the `/metrics` endpoint, set the `PROMETHEUS_ENABLED` setting to `True`.
 
-#### Test tools
+### Test tools
 
-##### Fixtures
+#### Fixtures
 
-###### `assert_metric`
+##### `assert_metric`
 
 To test your metrics using the `assert_metric` fixture:
 
@@ -127,44 +100,44 @@ def test_my_code__expected_metrics(assert_metric: AssertMetricFixture) -> None:
     )
 ```
 
-###### `saas_mode`
+##### `saas_mode`
 
 The `saas_mode` fixture makes all `common.core.utils.is_saas` calls return `True`.
 
-###### `enterprise_mode`
+##### `enterprise_mode`
 
 The `enterprise_mode` fixture makes all `common.core.utils.is_enterprise` calls return `True`.
 
-##### Markers
+#### Markers
 
-###### `pytest.mark.saas_mode`
+##### `pytest.mark.saas_mode`
 
 Use this mark to auto-use the `saas_mode` fixture.
 
-###### `pytest.mark.enterprise_mode`
+##### `pytest.mark.enterprise_mode`
 
 Use this mark to auto-use the `enterprise_mode` fixture.
 
-#### Metrics
+### Metrics
 
 Flagsmith uses Prometheus to track performance metrics.
 
 The following default metrics are exposed:
 
-##### Common metrics
+#### Common metrics
 
 - `flagsmith_build_info`: Has the labels `version` and `ci_commit_sha`.
 - `flagsmith_http_server_request_duration_seconds`: Histogram labeled with `method`, `route`, and `response_status`.
 - `flagsmith_http_server_requests_total`: Counter labeled with `method`, `route`, and `response_status`.
-- `flagsmith_http_server_response_size_bytes`:Histogram labeled with `method`, `route`, and `response_status`.
+- `flagsmith_http_server_response_size_bytes`: Histogram labeled with `method`, `route`, and `response_status`.
 - `flagsmith_task_processor_enqueued_tasks_total`: Counter labeled with `task_identifier`.
 
-##### Task Processor metrics
+#### Task Processor metrics
 
 - `flagsmith_task_processor_finished_tasks_total`: Counter labeled with `task_identifier`, `task_type` (`"recurring"`, `"standard"`) and `result` (`"success"`, `"failure"`).
 - `flagsmith_task_processor_task_duration_seconds`: Histogram labeled with `task_identifier`, `task_type` (`"recurring"`, `"standard"`) and `result` (`"success"`, `"failure"`).
 
-##### Guidelines
+#### Guidelines
 
 Try to come up with meaningful metrics to cover your feature with when developing it. Refer to [Prometheus best practices][1] when naming your metric and labels.
 
@@ -193,4 +166,3 @@ For testing your metrics, refer to [`assert_metric` documentation][5].
 [3]: https://docs.gunicorn.org/en/stable/design.html#server-model
 [4]: https://prometheus.github.io/client_python/multiprocess
 [5]: #assert_metric
-

{flagsmith_common-2.2.6 → flagsmith_common-3.0.0}/README.md

@@ -4,54 +4,28 @@
 
 Flagsmith's common library
 
-### Development Setup
+## Local development
 
-This project uses [Poetry](https://python-poetry.org/) for dependency management and includes a Makefile to simplify common development tasks.
+The project assumes the following tools installed:
 
-#### Prerequisites
+- [uv](https://github.com/astral-sh/uv)
+- [GNU Make](https://www.gnu.org/software/make/)
 
-- Python >= 3.11
-- Make
+To list available Makefile targets, run `make help`.
 
-#### Installation
+To set up local development environment, run `make install`.
 
-You can set up your development environment using the provided Makefile:
+To run linters, run `make lint`.
 
-```bash
-# Install everything (pip, poetry, and project dependencies)
-make install
+To run tests, run `make test`.
 
-# Individual installation steps are also available
-make install-pip       # Upgrade pip
-make install-poetry    # Install Poetry
-make install-packages  # Install project dependencies
-```
-
-#### Development
-
-Run linting checks using pre-commit:
-
-```bash
-make lint
-```
-
-Additional options can be passed to the `install-packages` target:
-
-```bash
-# Install with development dependencies
-make install-packages opts="--with dev"
-
-# Install with specific extras
-make install-packages opts="--extras 'feature1 feature2'"
-```
-
-### Usage
+## Usage
 
-#### Installation
+### Installation
 
-1. `poetry add flagsmith-common`
+1. Install all runtime packages: `uv add flagsmith-common[common-core,task-processor]`
 
-2. `poetry add --G dev flagsmith-common[test-tools]` — this will enable the Pytest fixtures. Skipping this step will make Pytest collection fail due to missing dependencies.
+2. To enable the Pytest fixtures, run `uv add --G dev flagsmith-common[test-tools]`. Skipping this step will make Pytest collection fail due to missing dependencies.
 
 3. Make sure `"common.core"` is in the `INSTALLED_APPS` of your settings module.
 This enables the `manage.py flagsmith` commands.
@@ -61,11 +35,11 @@ This enables the `route` label for Prometheus HTTP metrics.
 
 5. To enable the `/metrics` endpoint, set the `PROMETHEUS_ENABLED` setting to `True`.
 
-#### Test tools
+### Test tools
 
-##### Fixtures
+#### Fixtures
 
-###### `assert_metric`
+##### `assert_metric`
 
 To test your metrics using the `assert_metric` fixture:
 
@@ -84,44 +58,44 @@ def test_my_code__expected_metrics(assert_metric: AssertMetricFixture) -> None:
     )
 ```
 
-###### `saas_mode`
+##### `saas_mode`
 
 The `saas_mode` fixture makes all `common.core.utils.is_saas` calls return `True`.
 
-###### `enterprise_mode`
+##### `enterprise_mode`
 
 The `enterprise_mode` fixture makes all `common.core.utils.is_enterprise` calls return `True`.
 
-##### Markers
+#### Markers
 
-###### `pytest.mark.saas_mode`
+##### `pytest.mark.saas_mode`
 
 Use this mark to auto-use the `saas_mode` fixture.
 
-###### `pytest.mark.enterprise_mode`
+##### `pytest.mark.enterprise_mode`
 
 Use this mark to auto-use the `enterprise_mode` fixture.
 
-#### Metrics
+### Metrics
 
 Flagsmith uses Prometheus to track performance metrics.
 
 The following default metrics are exposed:
 
-##### Common metrics
+#### Common metrics
 
 - `flagsmith_build_info`: Has the labels `version` and `ci_commit_sha`.
 - `flagsmith_http_server_request_duration_seconds`: Histogram labeled with `method`, `route`, and `response_status`.
 - `flagsmith_http_server_requests_total`: Counter labeled with `method`, `route`, and `response_status`.
-- `flagsmith_http_server_response_size_bytes`:Histogram labeled with `method`, `route`, and `response_status`.
+- `flagsmith_http_server_response_size_bytes`: Histogram labeled with `method`, `route`, and `response_status`.
 - `flagsmith_task_processor_enqueued_tasks_total`: Counter labeled with `task_identifier`.
 
-##### Task Processor metrics
+#### Task Processor metrics
 
 - `flagsmith_task_processor_finished_tasks_total`: Counter labeled with `task_identifier`, `task_type` (`"recurring"`, `"standard"`) and `result` (`"success"`, `"failure"`).
 - `flagsmith_task_processor_task_duration_seconds`: Histogram labeled with `task_identifier`, `task_type` (`"recurring"`, `"standard"`) and `result` (`"success"`, `"failure"`).
 
-##### Guidelines
+#### Guidelines
 
 Try to come up with meaningful metrics to cover your feature with when developing it. Refer to [Prometheus best practices][1] when naming your metric and labels.
 

{flagsmith_common-2.2.6 → flagsmith_common-3.0.0}/pyproject.toml

@@ -1,27 +1,31 @@
 [project]
 name = "flagsmith-common"
-version = "2.2.6"
+version = "3.0.0"
 description = "Flagsmith's common library"
 requires-python = ">=3.11,<4.0"
-dependencies = [
-    "backoff (>=2.2.1,<3.0.0)",
-    "django (>4,<5)",
+dependencies = []
+optional-dependencies = { test-tools = [
+    "pyfakefs (>=5,<6)",
+    "pytest-django (>=4,<5)",
+], common-core = [
+    "django (>4,<6)",
     "django-health-check",
     "djangorestframework-recursive",
     "djangorestframework",
     "drf-writable-nested",
     "drf-yasg (>=1.21.10,<2.0.0)",
     "environs (<15)",
-    "flagsmith-flag-engine",
     "gunicorn (>=19.1)",
     "prometheus-client (>=0.0.16)",
     "psycopg2-binary (>=2.9,<3)",
     "requests",
     "simplejson (>=3,<4)",
-]
-optional-dependencies = { test-tools = [
-    "pyfakefs (>=5,<6)",
-    "pytest-django (>=4,<5)",
+
+], task-processor = [
+    "backoff (>=2.2.1,<3.0.0)",
+    "django (>4,<6)",
+    "django-health-check",
+    "prometheus-client (>=0.0.16)",
 ] }
 authors = [
     { name = "Matthew Elwell" },
@@ -37,7 +41,12 @@ maintainers = [{ name = "Flagsmith Team", email = "support@flagsmith.com" }]
 license = "BSD-3-Clause"
 license-files = ["LICENSE"]
 readme = "README.md"
-dynamic = ["classifiers"]
+classifiers = [
+    "Framework :: Django",
+    "Framework :: Pytest",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: BSD License",
+]
 
 [project.urls]
 Changelog = "https://github.com/flagsmith/flagsmith-common/blob/main/CHANGELOG.md"
@@ -52,41 +61,32 @@ flagsmith = "common.core.main:main"
 [project.entry-points.pytest11]
 flagsmith-test-tools = "common.test_tools.plugin"
 
-[tool.poetry]
-requires-poetry = ">=2.0"
-classifiers = [
-    "Framework :: Django",
-    "Framework :: Pytest",
-    "Intended Audience :: Developers",
-    "License :: OSI Approved :: BSD License",
+[dependency-groups]
+dev = [
+    "dj-database-url (>=2.3.0, <3.0.0)",
+    "django-stubs (>=5.1.3, <6.0.0)",
+    "djangorestframework-stubs (>=3.15.3, <4.0.0)",
+    "mypy (>=1.15.0, <2.0.0)",
+    "pre-commit",
+    "pyfakefs (>=5.7.4, <6.0.0)",
+    "pytest (>=8.3.4, <9.0.0)",
+    "pytest-asyncio (>=0.25.3, <1.0.0)",
+    "pytest-cov (>=6.0.0, <7.0.0)",
+    "pytest-django (>=4.10.0, <5.0.0)",
+    "pytest-freezegun (>=0.4.2, <1.0.0)",
+    "pytest-httpserver (>=1.1.3, <2.0.0)",
+    "pytest-mock (>=3.14.0, <4.0.0)",
+    "setuptools (>=78.1.1, <79.0.0)",
+    "types-simplejson (>=3.20.0.20250326, <4.0.0)",
+    "types-python-dateutil (>=2.9.0.20250516, <3.0.0)",
 ]
-packages = [
-    { include = "common", from = "src" },
-    { include = "task_processor", from = "src" },
-]
-
-[tool.poetry.group.dev.dependencies]
-dj-database-url = "^2.3.0"
-django-stubs = "^5.1.3"
-djangorestframework-stubs = "^3.15.3"
-mypy = "^1.15.0"
-pre-commit = "*"
-pyfakefs = "^5.7.4"
-pytest = "^8.3.4"
-pytest-asyncio = "^0.25.3"
-pytest-cov = "^6.0.0"
-pytest-django = "^4.10.0"
-pytest-freezegun = "^0.4.2"
-pytest-httpserver = "^1.1.3"
-pytest-mock = "^3.14.0"
-ruff = "==0.11.9"
-setuptools = "^78.1.1"
-types-simplejson = "^3.20.0.20250326"
-types-python-dateutil = "^2.9.0.20250516"
 
 [build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+requires = ["uv_build>=0.9.17,<0.10.0"]
+build-backend = "uv_build"
+
+[tool.uv.build-backend]
+module-name = ["common", "task_processor"]
 
 [tool.coverage.report]
 # Regexes for lines to exclude from consideration

{flagsmith_common-2.2.6 → flagsmith_common-3.0.0}/src/common/core/main.py

@@ -3,15 +3,13 @@ import logging
 import os
 import sys
 import typing
-from tempfile import gettempdir
+from tempfile import mkdtemp
 
 from django.core.management import (
     execute_from_command_line as django_execute_from_command_line,
 )
 
 from common.core.cli import healthcheck
-from common.core.constants import DEFAULT_PROMETHEUS_MULTIPROC_DIR_NAME
-from common.core.utils import clear_directory, make_writable_directory
 
 logger = logging.getLogger(__name__)
 
@@ -37,13 +35,8 @@ def ensure_cli_env() -> typing.Generator[None, None, None]:
     # TODO @khvn26 Move logging setup to here
 
     # Prometheus multiproc support
-    prom_dir = os.environ.setdefault(
-        "PROMETHEUS_MULTIPROC_DIR",
-        os.path.join(gettempdir(), DEFAULT_PROMETHEUS_MULTIPROC_DIR_NAME),
-    )
-    if os.path.exists(prom_dir):
-        clear_directory(prom_dir)
-    make_writable_directory(prom_dir)
+    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

{flagsmith_common-2.2.6 → flagsmith_common-3.0.0}/src/common/core/utils.py

@@ -1,9 +1,7 @@
 import json
 import logging
-import os
 import pathlib
 import random
-import shutil
 from functools import lru_cache
 from itertools import cycle
 from typing import (
@@ -200,30 +198,3 @@ def using_database_replica(
         return manager
 
     return manager.db_manager(chosen_replica)
-
-
-def clear_directory(directory_path: str) -> None:
-    """
-    Safely clear a directory including all subdirectories and files.
-    """
-    for p in pathlib.Path(directory_path).rglob("*"):
-        try:
-            # Ensure that the cleanup doesn't silently fail on
-            # files and subdirs created by other users.
-            p.chmod(0o777)
-        except (PermissionError, FileNotFoundError):  # pragma: no cover
-            pass
-
-    shutil.rmtree(directory_path, ignore_errors=True)
-
-
-def make_writable_directory(directory_path: str) -> None:
-    os.makedirs(directory_path, exist_ok=True)
-
-    try:
-        # While `mkdir` sets mode=0o777 by default, this can be affected by umask
-        # resulting in lesser permissions for other users. This step ensures the
-        # directory is writable for all users.
-        os.chmod(directory_path, 0o777)
-    except PermissionError:  # pragma: no cover
-        pass

{flagsmith_common-2.2.6 → flagsmith_common-3.0.0}/src/task_processor/views.py

@@ -10,7 +10,7 @@ from task_processor.monitoring import get_num_waiting_tasks
 from task_processor.serializers import MonitoringSerializer
 
 
-@swagger_auto_schema(method="GET", responses={200: MonitoringSerializer()})  # type: ignore[misc]
+@swagger_auto_schema(method="GET", responses={200: MonitoringSerializer()})  # type: ignore[untyped-decorator]
 @api_view(http_method_names=["GET"])
 @permission_classes([IsAuthenticated, IsAdminUser])
 def monitoring(request: Request, /, **kwargs: Any) -> Response: