Rebase

Signed-off-by: Alina Buzachis <[email protected]>

Author: alinabuzachis

core/tests/test_controller_client.py

@@ -1,12 +1,10 @@
-from core.controller_client import _aap_session
-from core.controller_client import get_http_session
-
+import core.controller_client as cc
 
 def test_get_http_session_caches():
     """Subsequent calls without force_refresh must return the *same* object."""
-    s1 = get_http_session()
-    s2 = get_http_session()
+    s1 = cc.get_http_session()
+    s2 = cc.get_http_session()
     assert s1 is s2
 
-    s3 = get_http_session(force_refresh=True)
-    assert s3 is not s1 and s3 is _aap_session
+    s3 = cc.get_http_session(force_refresh=True)
+    assert s3 is not s1 and s3 is cc._aap_session

pyproject.toml

@@ -16,6 +16,7 @@ license-files = ["LICENSE.md"]
 requires-python = ">=3.11,<3.14"
 dependencies = [
     "django-ansible-base==2025.5.8",
+    "requests>=2.31.0,<3.0",
 ]
 
 [project.urls]

requirements/requirements-all.txt

@@ -2,24 +2,10 @@
 # This file is autogenerated by pip-compile with Python 3.13
 # by the following command:
 #
-<<<<<<< HEAD
 #    pip-compile --extra=dev --extra=test --output-file=requirements/requirements-dev.txt pyproject.toml
 #
-<<<<<<< HEAD
 asgiref==3.8.1
     # via django
-=======
-aiohappyeyeballs==2.6.1
-    # via aiohttp
-aiohttp==3.12.13
-    # via
-    #   -r requirements/requirements.in
-    #   aiohttp-utils
-aiohttp-utils==3.2.1
-    # via -r requirements/requirements.in
-aiosignal==1.3.2
-    # via aiohttp
->>>>>>> 8ef19f3 (add aiohttp)
 astor==0.8.1
     # via flynt
 black==24.10.0
@@ -42,35 +28,10 @@ cryptography==45.0.4
     # via django-ansible-base
 distlib==0.3.9
     # via virtualenv
-=======
-#    pip-compile --output-file=requirements/requirements-dev.txt requirements/requirements-dev.in
-#
-asgiref==3.8.1
-    # via
-    #   -r requirements/requirements-dev.in
-    #   django
-astor==0.8.1
-    # via flynt
-black==24.10.0
-    # via -r requirements/requirements-dev.in
-certifi==2025.7.9
-    # via requests
-cffi==1.17.1
-    # via cryptography
-charset-normalizer==3.4.2
-    # via requests
-click==8.2.1
-    # via black
-cryptography==45.0.4
-    # via
-    #   -r requirements/requirements-dev.in
-    #   django-ansible-base
->>>>>>> 474aa53 (Update requirements)
 django==4.2.23
     # via
     #   django-ansible-base
     #   django-crum
-<<<<<<< HEAD
     #   django-stubs
     #   django-stubs-ext
     #   djangorestframework
@@ -82,18 +43,10 @@ django-stubs==5.2.1
     # via pattern_service (pyproject.toml)
 django-stubs-ext==5.2.1
     # via django-stubs
-=======
-    #   djangorestframework
-django-ansible-base==2025.5.8
-    # via -r requirements/requirements-dev.in
-django-crum==0.7.9
-    # via django-ansible-base
->>>>>>> 474aa53 (Update requirements)
 djangorestframework==3.16.0
     # via django-ansible-base
 dynaconf==3.2.11
     # via django-ansible-base
-<<<<<<< HEAD
 filelock==3.18.0
     # via
     #   tox
@@ -112,22 +65,6 @@ mccabe==0.7.0
     # via flake8
 mypy==1.16.0
     # via pattern_service (pyproject.toml)
-=======
-flake8==6.1.0
-    # via -r requirements/requirements-dev.in
-flynt==1.0.2
-    # via -r requirements/requirements-dev.in
-idna==3.10
-    # via requests
-inflection==0.5.1
-    # via django-ansible-base
-isort==5.13.2
-    # via -r requirements/requirements-dev.in
-mccabe==0.7.0
-    # via flake8
-mypy==1.16.0
-    # via -r requirements/requirements-dev.in
->>>>>>> 474aa53 (Update requirements)
 mypy-extensions==1.1.0
     # via
     #   black
@@ -146,7 +83,6 @@ pathspec==0.12.1
 pip-tools==7.4.1
     # via pattern_service (pyproject.toml)
 platformdirs==4.3.8
-<<<<<<< HEAD
     # via
     #   black
     #   tox
@@ -155,18 +91,12 @@ pluggy==1.6.0
     # via
     #   pytest
     #   tox
-=======
-    # via black
-psycopg==3.2.9
-    # via -r requirements/requirements-dev.in
->>>>>>> 474aa53 (Update requirements)
 pycodestyle==2.11.1
     # via flake8
 pycparser==2.22
     # via cffi
 pyflakes==3.1.0
     # via flake8
-<<<<<<< HEAD
 pygments==2.19.2
     # via pytest
 pyproject-api==1.9.1
@@ -181,18 +111,10 @@ pytest-django==4.11.1
     # via pattern_service (pyproject.toml)
 python-dotenv==1.1.1
     # via pattern_service (pyproject.toml)
-=======
-pyjwt==2.10.1
-    # via -r requirements/requirements-dev.in
-requests==2.32.4
-    # via -r requirements/requirements-dev.in
->>>>>>> 474aa53 (Update requirements)
 sqlparse==0.5.3
     # via
     #   django
     #   django-ansible-base
-<<<<<<< HEAD
-<<<<<<< HEAD
 tox==4.27.0
     # via pattern_service (pyproject.toml)
 types-pyyaml==6.0.12.20250516
@@ -210,19 +132,3 @@ wheel==0.45.1
 # The following packages are considered to be unsafe in a requirements file:
 # pip
 # setuptools
-=======
-=======
-types-requests==2.32.4.20250611
-    # via -r requirements/requirements-dev.in
->>>>>>> 40aa17c (Fix dependencies:)
-typing-extensions==4.13.2
-    # via mypy
-urllib3==2.5.0
-<<<<<<< HEAD
-    # via requests
->>>>>>> 474aa53 (Update requirements)
-=======
-    # via
-    #   requests
-    #   types-requests
->>>>>>> 40aa17c (Fix dependencies:)

requirements/requirements-dev.in

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.13
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    pip-compile --output-file=requirements/requirements.txt pyproject.toml
@@ -26,17 +26,15 @@ django-crum==0.7.9
 djangorestframework==3.16.0
     # via django-ansible-base
 dynaconf==3.2.11
-    # via
-    #   -r requirements/requirements.in
-    #   django-ansible-base
+    # via django-ansible-base
 idna==3.10
     # via requests
 inflection==0.5.1
     # via django-ansible-base
 pycparser==2.22
     # via cffi
-requests==2.32.3
-    # via -r requirements/requirements.in
+requests==2.32.4
+    # via pattern_service (pyproject.toml)
 sqlparse==0.5.3
     # via
     #   django