diff --git a/.vscode/settings.json b/.vscode/settings.json index 86f9bf61f..224bcfabe 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -56,4 +56,11 @@ "Dateonly", "sessionmaker" ], + "files.watcherExclude": { + "**/.git/objects/**": true, + "**/.git/subtree-cache/**": true, + "**/node_modules/**": true, + "**/venv*/**": true, + "**/__pycache__/**": true + }, } \ No newline at end of file diff --git a/src/_example/django/Dockerfile b/src/_example/django/Dockerfile index f37debace..b4af00fdc 100644 --- a/src/_example/django/Dockerfile +++ b/src/_example/django/Dockerfile @@ -28,14 +28,15 @@ RUN \ # Copy the source code into the container. # we're using a volume for that, but for initialization -COPY ./ /app/ - -WORKDIR /app/src/_example/django/ RUN curl -sSL https://install.python-poetry.org | python3 - ;\ export PATH="/opt/poetry/bin:$PATH" -RUN /opt/poetry/bin/poetry install --no-cache +COPY ./ /app/ + +WORKDIR /app/src/_example/django/ + +RUN /opt/poetry/bin/poetry install --no-cache --no-interaction # for a bind mount on running repo VOLUME /app diff --git a/src/_example/django/docker-compose.yaml b/src/_example/django/docker-compose.yaml index a8c712f55..ade4bd562 100644 --- a/src/_example/django/docker-compose.yaml +++ b/src/_example/django/docker-compose.yaml @@ -17,7 +17,7 @@ services: PYTHON_VERSION: 3.11 # 3.11 is default if not set environment: # forest related - FOREST_VERIFY_SSL: "False" + FOREST_VERIFY_SSL: False FOREST_SERVER_URL: 'https://api.development.forestadmin.com' # django related DJANGO_SECRET_KEY: "^=k+h&r(f7d+#@3f)%h2xef!zvsn2f5_^ahuo*9v7k^6gk=*ey" diff --git a/src/_example/django/poetry.lock b/src/_example/django/poetry.lock index 83a2e357c..a25c1f6a7 100644 --- a/src/_example/django/poetry.lock +++ b/src/_example/django/poetry.lock @@ -733,7 +733,7 @@ pyflakes = ">=2.5.0,<2.6.0" [[package]] name = "forestadmin-agent-django" -version = "1.17.0" +version = "1.19.0" description = "django agent for forestadmin python agent" optional = false python-versions = ">=3.8,<3.13" @@ -744,8 +744,8 @@ develop = true "backports.zoneinfo" = {version = "~=0.2.1", extras = ["tzdata"], markers = "python_version < \"3.9\""} django = ">=3.2,<6.0" django-cors-headers = ">=3.8" -forestadmin-agent-toolkit = "1.17.0" -forestadmin-datasource-django = "1.17.0" +forestadmin-agent-toolkit = "1.19.0" +forestadmin-datasource-django = "1.19.0" typing-extensions = "~=4.2" [package.source] @@ -754,7 +754,7 @@ url = "../../django_agent" [[package]] name = "forestadmin-agent-toolkit" -version = "1.17.0" +version = "1.19.0" description = "agent toolkit for forestadmin python agent" optional = false python-versions = ">=3.8,<3.13" @@ -765,7 +765,7 @@ develop = true aiohttp = "~=3.9" "backports.zoneinfo" = {version = "~0.2.1", extras = ["tzdata"], markers = "python_version < \"3.9\""} cachetools = "~=5.2" -forestadmin-datasource-toolkit = "1.17.0" +forestadmin-datasource-toolkit = "1.19.0" marshmallow-jsonapi = ">=0.24.0, <1.0" numpy = [ {version = ">=1.26.0,<2.0.0", markers = "python_full_version >= \"3.12.0\""}, @@ -783,7 +783,7 @@ url = "../../agent_toolkit" [[package]] name = "forestadmin-datasource-django" -version = "1.17.0" +version = "1.19.0" description = "django datasource for forestadmin python agent" optional = false python-versions = ">=3.8,<3.13" @@ -793,8 +793,8 @@ develop = true [package.dependencies] "backports.zoneinfo" = {version = "~=0.2.1", extras = ["tzdata"], markers = "python_version < \"3.9\""} django = ">=3.2,<6.0" -forestadmin-agent-toolkit = "1.17.0" -forestadmin-datasource-toolkit = "1.17.0" +forestadmin-agent-toolkit = "1.19.0" +forestadmin-datasource-toolkit = "1.19.0" typing-extensions = "~=4.2" [package.source] @@ -803,7 +803,7 @@ url = "../../datasource_django" [[package]] name = "forestadmin-datasource-sqlalchemy" -version = "1.17.0" +version = "1.19.0" description = "sqlalchemy datasource for forestadmin python agent" optional = false python-versions = ">=3.8,<3.13" @@ -812,8 +812,8 @@ develop = true [package.dependencies] "backports.zoneinfo" = {version = "~=0.2.1", extras = ["tzdata"], markers = "python_version < \"3.9\""} -forestadmin-agent-toolkit = "1.17.0" -forestadmin-datasource-toolkit = "1.17.0" +forestadmin-agent-toolkit = "1.19.0" +forestadmin-datasource-toolkit = "1.19.0" sqlalchemy = ">=1.4.0" typing-extensions = "~=4.2" @@ -823,7 +823,7 @@ url = "../../datasource_sqlalchemy" [[package]] name = "forestadmin-datasource-toolkit" -version = "1.17.0" +version = "1.19.0" description = "datasource toolkit for forestadmin python agent" optional = false python-versions = ">=3.8,<3.13" @@ -2432,4 +2432,4 @@ propcache = ">=0.2.0" [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.13" -content-hash = "9b53c8148f88a8d534edc0d02082b83e838a8b1d76dd643fa9dfbe56a844f542" +content-hash = "098c1001a3b24a77f0ef739506f2f4ed3d99e147e005f669fac6952d5b3f214f" diff --git a/src/agent_toolkit/forestadmin/agent_toolkit/services/permissions/sse_cache_invalidation.py b/src/agent_toolkit/forestadmin/agent_toolkit/services/permissions/sse_cache_invalidation.py index 29dc247d6..f4cc65f91 100644 --- a/src/agent_toolkit/forestadmin/agent_toolkit/services/permissions/sse_cache_invalidation.py +++ b/src/agent_toolkit/forestadmin/agent_toolkit/services/permissions/sse_cache_invalidation.py @@ -42,7 +42,10 @@ def run(self) -> None: url = f"{self.options['server_url']}/liana/v4/subscribe-to-events" headers = {"forest-secret-key": self.options["env_secret"], "Accept": "text/event-stream"} try: - http = urllib3.PoolManager() + args = {} + if self.options["verify_ssl"] is False: + args["cert_reqs"] = "CERT_NONE" + http = urllib3.PoolManager(**args) self.sse_client = SSEClient(http.request("GET", url, preload_content=False, headers=headers)) for msg in self.sse_client.events():