pulp-ansible 0.27.1__py3-none-any.whl → 0.28.1__py3-none-any.whl

pulp_ansible/app/__init__.py

@@ -8,6 +8,6 @@ class PulpAnsiblePluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_ansible.app"
     label = "ansible"
-    version = "0.27.1"
+    version = "0.28.1"
     python_package_name = "pulp-ansible"
     domain_compatible = True

pulp_ansible/app/galaxy/v3/filters.py

@@ -187,6 +187,4 @@ class CollectionVersionSearchFilter(FilterSet):
         Returns:
             Queryset of CollectionVersion that matches all tags
         """
-        for tag in value.split(","):
-            qs = qs.filter(collection_version__tags__name=tag)
-        return qs
+        return qs.filter(collection_version__tags__contains=value.split(","))

pulp_ansible/app/migrations/0065_collectionversion_ansible_col_namespa_ea6f75_idx.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.22 on 2025-07-09 10:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("ansible", "0064_alter_collection_unique_together_and_more"),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name="collectionversion",
+            index=models.Index(
+                fields=["namespace", "name", "version"], name="ansible_col_namespa_ea6f75_idx"
+            ),
+        ),
+    ]

pulp_ansible/app/models.py

@@ -215,6 +215,9 @@ class CollectionVersion(Content):
     class Meta:
         default_related_name = "%(app_label)s_%(model_name)s"
         unique_together = ("sha256", "_pulp_domain")
+        indexes = [
+            models.Index(fields=["namespace", "name", "version"]),
+        ]
 
 
 class CollectionVersionMark(Content):

pulp_ansible/app/tasks/collections.py

@@ -1,4 +1,5 @@
 import asyncio
+import functools
 import hashlib
 import json
 import logging
@@ -13,7 +14,6 @@ import tempfile
 import yaml
 from aiohttp.client_exceptions import ClientError, ClientResponseError
 from asgiref.sync import sync_to_async
-from async_lru import alru_cache
 from django.db import transaction
 from django.db.models import Q
 from django.db.utils import IntegrityError
@@ -82,6 +82,26 @@ log = logging.getLogger(__name__)
 aget_url = sync_to_async(get_url)
 
 
+def async_cache(f):
+    # A simple implementation for caching an async function with hashable arguments.
+    _cache = {}
+
+    @functools.wraps(f)
+    async def _wrapped_f(*args):
+        try:
+            return _cache[args]
+        except KeyError:
+            result = await f(*args)
+            _cache[args] = result
+            if len(_cache) > 128:
+                # This is a bit ad hoc and will give fifo instead of lru behaviour.
+                # I doubt it even makes a difference here.
+                _cache.pop(next(iter(_cache.keys())))
+            return result
+
+    return _wrapped_f
+
+
 # semantic_version.SimpleSpec interpretes "*" as ">=0.0.0"
 class AnsibleSpec(SimpleSpec):
     def __init__(self, expression):
@@ -539,7 +559,7 @@ class CollectionSyncFirstStage(Stage):
             self._should_we_sync()
         )
 
-    @alru_cache(maxsize=128)
+    @async_cache
     async def _get_root_api(self, root):
         """
         Returns the root api path and api version.
@@ -575,7 +595,7 @@ class CollectionSyncFirstStage(Stage):
 
         return endpoint, api_version
 
-    @alru_cache(maxsize=128)
+    @async_cache
     async def _get_paginated_collection_api(self, root):
         """
         Returns the collection api path and api version.

{pulp_ansible-0.27.1.dist-info → pulp_ansible-0.28.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-ansible
-Version: 0.27.1
+Version: 0.28.1
 Summary: Pulp plugin to manage Ansible content, e.g. roles
 Author-email: Pulp Ansible Plugin Project Developers <pulp-dev@redhat.com>
 Project-URL: Homepage, https://pulpproject.org
@@ -14,17 +14,15 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: Framework :: Django
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE
-Requires-Dist: async_lru<2.1,>=1.0
-Requires-Dist: galaxy_importer<0.5,>=0.4.5
+Requires-Dist: galaxy_importer<0.5,>=0.4.27
 Requires-Dist: GitPython<3.2,>=3.1.24
-Requires-Dist: jsonschema<4.24,>=4.9
-Requires-Dist: Pillow<11.2,>=10.3
-Requires-Dist: pulpcore<3.85,>=3.63.0
-Requires-Dist: PyYAML<7.0,>=5.4.1
+Requires-Dist: jsonschema<4.26,>=4.9
+Requires-Dist: Pillow<11.4,>=10.3
+Requires-Dist: pulpcore<3.100,>=3.63.0
+Requires-Dist: PyYAML<7.0,>=6.0.2
 Requires-Dist: semantic_version<2.11,>=2.9
 Dynamic: license-file
 

{pulp_ansible-0.27.1.dist-info → pulp_ansible-0.28.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
 pulp_ansible/__init__.py,sha256=WXL3JyOZzh4tALN4OBNgqj412O2LXVr8iYSn14Av0_o,67
 pulp_ansible/pytest_plugin.py,sha256=hi9crI7QGghXCItNx27pW6KoXMzZqhAqAUstpJrsmlA,9105
-pulp_ansible/app/__init__.py,sha256=yalBh_gQ2pGKplwNWMSu7vmDo33ZnWjRo5LE2LsxdKM,308
+pulp_ansible/app/__init__.py,sha256=fWVAEE6eDIn22Kvy7rtYgrIGgNQ3esEpVdawce8Ion4,308
 pulp_ansible/app/constants.py,sha256=cRrWMbJU-v1nCY2CjmGTOFGzz5aggn4ZKIs4-zeYADQ,78
 pulp_ansible/app/downloaders.py,sha256=0xrAXzhTMJ6ywvs6XyYNAKvRzYb_UZR6A5_WgaHvuiE,8331
 pulp_ansible/app/fields.py,sha256=yV3FL-47K-nxbiBxgzWi1hk3tfLsRdgic59LiwT2Fvs,624
 pulp_ansible/app/global_access_conditions.py,sha256=ayV_LbQIa4ReuDYQycdDY7WysfGk-e0gbuDGhAQFWyY,1235
 pulp_ansible/app/logutils.py,sha256=My4XivZMYLKeJqPHFwk3pIZSGlspALhI93vZxwWzlSY,846
 pulp_ansible/app/modelresource.py,sha256=fJ_njrSWdftFQpA54e6mdoIWG_zqBjpp2TkkyU8Y7D4,7181
-pulp_ansible/app/models.py,sha256=Wz7Xm3bDZphH-GLDoIQpK-ACxsltbr5WU1HYMmbmSRc,22612
+pulp_ansible/app/models.py,sha256=CrEcVxQUlb6V_d9l7_as7_Gi6TrBuJ_xJLhFCR_5jew,22709
 pulp_ansible/app/serializers.py,sha256=5_NM1tpMLrZ2QsNCWanaHhscGCS_QDLubXCTh5xwm8E,35981
 pulp_ansible/app/settings.py,sha256=ArDsI7VezOpKM9iFqxXb6VmEDOtRUS5lfB_oklkcxds,1244
 pulp_ansible/app/urls.py,sha256=gpMqsYPgHfc_6-EySR9ezUnI1F5yklzOVlSz9nlppmY,8697
@@ -19,7 +19,7 @@ pulp_ansible/app/galaxy/serializers.py,sha256=47ORFSvPxBBjii5Y2_0EaoNJFMlKVOwFZd
 pulp_ansible/app/galaxy/views.py,sha256=imf5_XWbp-8i_9xmw009kk8GaMijq4hkdOxXq-Kh9eo,3639
 pulp_ansible/app/galaxy/v3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_ansible/app/galaxy/v3/exceptions.py,sha256=uKTj_LteLusc9Wu0iSYO-U8Gq9UK1eVRXaxmQ1no3gA,1800
-pulp_ansible/app/galaxy/v3/filters.py,sha256=xkb_m8chPZBJzElwuFkhLV5Hx8I1A7ZnxdTqGYFnpyc,8087
+pulp_ansible/app/galaxy/v3/filters.py,sha256=XW39dC4N531Rlkhof5a-MDqxU2gFAkKWG3eeuIe02FY,8047
 pulp_ansible/app/galaxy/v3/pagination.py,sha256=FhFKtPfljjmKrnB_EWz7FxAhKPX9gkuvbOx-2KU9V4Y,4042
 pulp_ansible/app/galaxy/v3/serializers.py,sha256=VV2p-gLHKy0EnRBsblPga2Lcn9fLp5qp_7rhlaAlDmY,13364
 pulp_ansible/app/galaxy/v3/views.py,sha256=PJyK85cqLPRXVXY8B-shKGIh93mpnWONH1PplAD6MWM,47750
@@ -92,11 +92,12 @@ pulp_ansible/app/migrations/0061_collectionversion_new_tags.py,sha256=Hkf5oaJU7N
 pulp_ansible/app/migrations/0062_pivot_collectionversion_tags.py,sha256=Jn8PElX_f8x_5VYc525Kj-cd-17_GHPdop8-65rYPBk,4875
 pulp_ansible/app/migrations/0063_domain_support.py,sha256=jms2LMvIvF7dXbIIoSH3u5XNMbRn8aK5Kkc3CQznem8,4044
 pulp_ansible/app/migrations/0064_alter_collection_unique_together_and_more.py,sha256=sXzRG3BGVHuDcfuPjHIKIbmDqMgGDs5tCpkmKwY-JL8,2158
+pulp_ansible/app/migrations/0065_collectionversion_ansible_col_namespa_ea6f75_idx.py,sha256=MCqN5w59xqke3z7Kq7elvG_JWFvE5GP5K2whyECxpoQ,483
 pulp_ansible/app/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_ansible/app/schema/__init__.py,sha256=eGi2QVJ0kJgXwiDNjQsvqWDSr3EA8TFqFZATTY8xwT8,207
 pulp_ansible/app/schema/copy_config.json,sha256=AJz8riON7_rh-L7jM5iev2Imc5UKjlNvGfwF7KrFH7Y,568
 pulp_ansible/app/tasks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pulp_ansible/app/tasks/collections.py,sha256=s7sVep8PrWHvaD14JymUv4D6HpcGtczyUKCLgY3MftE,50111
+pulp_ansible/app/tasks/collections.py,sha256=aP0o-DTzlkHXZMn-uASwHrld6pVBztErTR-ErKeid6g,50672
 pulp_ansible/app/tasks/collectionversion_index.py,sha256=_cnQeWRpFXrreTJM9aaEc2HuknTksZa0lLZ7XUfmQ_c,9401
 pulp_ansible/app/tasks/copy.py,sha256=dO_DnLT5hck6GpZomEHurrDHJM0Wkh2B0_wgHHOtbuY,5563
 pulp_ansible/app/tasks/deletion.py,sha256=f-VNTMzDMQiJpCLN34fY5gwhAGlh3RACj4VWc_tOaP0,3579
@@ -166,9 +167,9 @@ pulp_ansible/tests/unit/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 pulp_ansible/tests/unit/migrations/conftest.py,sha256=61n56aJuwEuAcUS27xnmnEDx6Ie7M5zxh851doWm7Ok,438
 pulp_ansible/tests/unit/migrations/test_0057_collection_version_sha256_migrate.py,sha256=NmU-frZNO1qHvhdxfw-bwPTEkqN4Wdc3dEs9dWME47o,2174
 pulp_ansible/tests/unit/migrations/test_x_repo_search_migration.py,sha256=IrC_V_Gss4nqhkdL-60upcEzGcz8IsiI2d-MfUtFY-g,657
-pulp_ansible-0.27.1.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pulp_ansible-0.27.1.dist-info/METADATA,sha256=eSJwISNcx_Tb9Om-gkdsMDix4WigVSJCnChYjYRaJ00,3207
-pulp_ansible-0.27.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pulp_ansible-0.27.1.dist-info/entry_points.txt,sha256=6PFqCdT7Yn7U5MlioYRsyyWbJDcZI2aAJuzc7yXHqGk,119
-pulp_ansible-0.27.1.dist-info/top_level.txt,sha256=5Rrg5DSM_F9wH8vu8Fxjb5EmroC-I8RVKp05fhXH6kQ,13
-pulp_ansible-0.27.1.dist-info/RECORD,,
+pulp_ansible-0.28.1.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pulp_ansible-0.28.1.dist-info/METADATA,sha256=4D1uj12SJ7hS60hxgGxODb-6_C44NytkLEA7OMgkkoc,3125
+pulp_ansible-0.28.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pulp_ansible-0.28.1.dist-info/entry_points.txt,sha256=6PFqCdT7Yn7U5MlioYRsyyWbJDcZI2aAJuzc7yXHqGk,119
+pulp_ansible-0.28.1.dist-info/top_level.txt,sha256=5Rrg5DSM_F9wH8vu8Fxjb5EmroC-I8RVKp05fhXH6kQ,13
+pulp_ansible-0.28.1.dist-info/RECORD,,