pulp-ansible-client 0.29.2__py3-none-any.whl → 0.29.3__py3-none-any.whl

pulpcore/client/pulp_ansible/models/ansible_collection_version_response.py

@@ -30,13 +30,13 @@ class AnsibleCollectionVersionResponse(BaseModel):
     """
     A serializer for CollectionVersion Content.
     """ # noqa: E501
+    pulp_last_updated: Optional[datetime] = Field(default=None, description="Timestamp of the last time this resource was updated. Note: for immutable resources - like content, repository versions, and publication - pulp_created and pulp_last_updated dates will be the same.")
     pulp_created: Optional[datetime] = Field(default=None, description="Timestamp of creation.")
+    pulp_href: Optional[StrictStr] = None
     artifact: Optional[StrictStr] = Field(default=None, description="Artifact file representing the physical content")
-    pulp_labels: Optional[Dict[str, Optional[StrictStr]]] = Field(default=None, description="A dictionary of arbitrary key/value pairs used to describe a specific Content instance.")
-    pulp_last_updated: Optional[datetime] = Field(default=None, description="Timestamp of the last time this resource was updated. Note: for immutable resources - like content, repository versions, and publication - pulp_created and pulp_last_updated dates will be the same.")
     vuln_report: Optional[StrictStr] = None
-    pulp_href: Optional[StrictStr] = None
     prn: Optional[StrictStr] = Field(default=None, description="The Pulp Resource Name (PRN).")
+    pulp_labels: Optional[Dict[str, Optional[StrictStr]]] = Field(default=None, description="A dictionary of arbitrary key/value pairs used to describe a specific Content instance.")
     sha256: Optional[StrictStr] = Field(default=None, description="The SHA-256 checksum if available.")
     md5: Optional[StrictStr] = Field(default=None, description="The MD5 checksum if available.")
     sha1: Optional[StrictStr] = Field(default=None, description="The SHA-1 checksum if available.")
@@ -57,7 +57,7 @@ class AnsibleCollectionVersionResponse(BaseModel):
     tags: Optional[List[CollectionSummaryResponseTagsInner]] = None
     version: Optional[Annotated[str, Field(strict=True, max_length=128)]] = Field(default=None, description="The version of the collection.")
     requires_ansible: Optional[StrictStr] = Field(default=None, description="The version of Ansible required to use the collection. Multiple versions can be separated with a comma.")
-    __properties: ClassVar[List[str]] = ["pulp_created", "artifact", "pulp_labels", "pulp_last_updated", "vuln_report", "pulp_href", "prn", "sha256", "md5", "sha1", "sha224", "sha384", "sha512", "id", "authors", "dependencies", "description", "documentation", "homepage", "issues", "license", "name", "namespace", "origin_repository", "tags", "version", "requires_ansible"]
+    __properties: ClassVar[List[str]] = ["pulp_last_updated", "pulp_created", "pulp_href", "artifact", "vuln_report", "prn", "pulp_labels", "sha256", "md5", "sha1", "sha224", "sha384", "sha512", "id", "authors", "dependencies", "description", "documentation", "homepage", "issues", "license", "name", "namespace", "origin_repository", "tags", "version", "requires_ansible"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -113,10 +113,10 @@ class AnsibleCollectionVersionResponse(BaseModel):
         * OpenAPI `readOnly` fields are excluded.
         """
         excluded_fields: Set[str] = set([
-            "pulp_created",
             "pulp_last_updated",
-            "vuln_report",
+            "pulp_created",
             "pulp_href",
+            "vuln_report",
             "prn",
             "sha256",
             "md5",

pulpcore/client/pulp_ansible/models/ansible_git_remote.py

@@ -28,29 +28,29 @@ class AnsibleGitRemote(BaseModel):
     """
     A serializer for Git Collection Remotes.
     """ # noqa: E501
-    total_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.total (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
-    sock_read_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.sock_read (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
-    download_concurrency: Optional[StrictInt] = Field(default=None, description="Total number of simultaneous connections. If not set then the default value will be used.")
+    url: Annotated[str, Field(min_length=1, strict=True)] = Field(description="The URL of an external content source.")
     max_retries: Optional[StrictInt] = Field(default=None, description="Maximum number of retry attempts after a download failure. If not set then the default value (3) will be used.")
-    password: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The password to be used for authentication when syncing. Extra leading and trailing whitespace characters are not trimmed.")
+    proxy_url: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The proxy URL. Format: scheme://host:port")
+    headers: Optional[List[Dict[str, Any]]] = Field(default=None, description="Headers for aiohttp.Clientsession")
+    client_key: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="A PEM encoded private key used for authentication.")
+    name: Annotated[str, Field(min_length=1, strict=True)] = Field(description="A unique name for this remote.")
+    download_concurrency: Optional[StrictInt] = Field(default=None, description="Total number of simultaneous connections. If not set then the default value will be used.")
     client_cert: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="A PEM encoded client certificate used for authentication.")
+    total_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.total (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     tls_validation: Optional[StrictBool] = Field(default=None, description="If True, TLS peer validation must be performed.")
+    password: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The password to be used for authentication when syncing. Extra leading and trailing whitespace characters are not trimmed.")
+    sock_read_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.sock_read (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
+    rate_limit: Optional[StrictInt] = Field(default=None, description="Limits requests per second for each concurrent downloader")
+    proxy_username: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The username to authenticte to the proxy.")
     username: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The username to be used for authentication when syncing.")
+    sock_connect_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.sock_connect (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
+    proxy_password: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The password to authenticate to the proxy. Extra leading and trailing whitespace characters are not trimmed.")
+    ca_cert: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="A PEM encoded CA certificate used to validate the server certificate presented by the remote server.")
     pulp_labels: Optional[Dict[str, Optional[StrictStr]]] = None
     connect_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.connect (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
-    ca_cert: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="A PEM encoded CA certificate used to validate the server certificate presented by the remote server.")
-    proxy_password: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The password to authenticate to the proxy. Extra leading and trailing whitespace characters are not trimmed.")
-    proxy_url: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The proxy URL. Format: scheme://host:port")
-    proxy_username: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The username to authenticte to the proxy.")
-    rate_limit: Optional[StrictInt] = Field(default=None, description="Limits requests per second for each concurrent downloader")
-    headers: Optional[List[Dict[str, Any]]] = Field(default=None, description="Headers for aiohttp.Clientsession")
-    url: Annotated[str, Field(min_length=1, strict=True)] = Field(description="The URL of an external content source.")
-    client_key: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="A PEM encoded private key used for authentication.")
-    sock_connect_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.sock_connect (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
-    name: Annotated[str, Field(min_length=1, strict=True)] = Field(description="A unique name for this remote.")
     metadata_only: Optional[StrictBool] = Field(default=None, description="If True, only metadata about the content will be stored in Pulp. Clients will retrieve content from the remote URL.")
     git_ref: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="A git ref. e.g.: branch, tag, or commit sha.")
-    __properties: ClassVar[List[str]] = ["total_timeout", "sock_read_timeout", "download_concurrency", "max_retries", "password", "client_cert", "tls_validation", "username", "pulp_labels", "connect_timeout", "ca_cert", "proxy_password", "proxy_url", "proxy_username", "rate_limit", "headers", "url", "client_key", "sock_connect_timeout", "name", "metadata_only", "git_ref"]
+    __properties: ClassVar[List[str]] = ["url", "max_retries", "proxy_url", "headers", "client_key", "name", "download_concurrency", "client_cert", "total_timeout", "tls_validation", "password", "sock_read_timeout", "rate_limit", "proxy_username", "username", "sock_connect_timeout", "proxy_password", "ca_cert", "pulp_labels", "connect_timeout", "metadata_only", "git_ref"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -91,81 +91,81 @@ class AnsibleGitRemote(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # set to None if total_timeout (nullable) is None
+        # set to None if max_retries (nullable) is None
         # and model_fields_set contains the field
-        if self.total_timeout is None and "total_timeout" in self.model_fields_set:
-            _dict['total_timeout'] = None
+        if self.max_retries is None and "max_retries" in self.model_fields_set:
+            _dict['max_retries'] = None
 
-        # set to None if sock_read_timeout (nullable) is None
+        # set to None if proxy_url (nullable) is None
         # and model_fields_set contains the field
-        if self.sock_read_timeout is None and "sock_read_timeout" in self.model_fields_set:
-            _dict['sock_read_timeout'] = None
+        if self.proxy_url is None and "proxy_url" in self.model_fields_set:
+            _dict['proxy_url'] = None
+
+        # set to None if client_key (nullable) is None
+        # and model_fields_set contains the field
+        if self.client_key is None and "client_key" in self.model_fields_set:
+            _dict['client_key'] = None
 
         # set to None if download_concurrency (nullable) is None
         # and model_fields_set contains the field
         if self.download_concurrency is None and "download_concurrency" in self.model_fields_set:
             _dict['download_concurrency'] = None
 
-        # set to None if max_retries (nullable) is None
-        # and model_fields_set contains the field
-        if self.max_retries is None and "max_retries" in self.model_fields_set:
-            _dict['max_retries'] = None
-
-        # set to None if password (nullable) is None
-        # and model_fields_set contains the field
-        if self.password is None and "password" in self.model_fields_set:
-            _dict['password'] = None
-
         # set to None if client_cert (nullable) is None
         # and model_fields_set contains the field
         if self.client_cert is None and "client_cert" in self.model_fields_set:
             _dict['client_cert'] = None
 
-        # set to None if username (nullable) is None
-        # and model_fields_set contains the field
-        if self.username is None and "username" in self.model_fields_set:
-            _dict['username'] = None
-
-        # set to None if connect_timeout (nullable) is None
+        # set to None if total_timeout (nullable) is None
         # and model_fields_set contains the field
-        if self.connect_timeout is None and "connect_timeout" in self.model_fields_set:
-            _dict['connect_timeout'] = None
+        if self.total_timeout is None and "total_timeout" in self.model_fields_set:
+            _dict['total_timeout'] = None
 
-        # set to None if ca_cert (nullable) is None
+        # set to None if password (nullable) is None
         # and model_fields_set contains the field
-        if self.ca_cert is None and "ca_cert" in self.model_fields_set:
-            _dict['ca_cert'] = None
+        if self.password is None and "password" in self.model_fields_set:
+            _dict['password'] = None
 
-        # set to None if proxy_password (nullable) is None
+        # set to None if sock_read_timeout (nullable) is None
         # and model_fields_set contains the field
-        if self.proxy_password is None and "proxy_password" in self.model_fields_set:
-            _dict['proxy_password'] = None
+        if self.sock_read_timeout is None and "sock_read_timeout" in self.model_fields_set:
+            _dict['sock_read_timeout'] = None
 
-        # set to None if proxy_url (nullable) is None
+        # set to None if rate_limit (nullable) is None
         # and model_fields_set contains the field
-        if self.proxy_url is None and "proxy_url" in self.model_fields_set:
-            _dict['proxy_url'] = None
+        if self.rate_limit is None and "rate_limit" in self.model_fields_set:
+            _dict['rate_limit'] = None
 
         # set to None if proxy_username (nullable) is None
         # and model_fields_set contains the field
         if self.proxy_username is None and "proxy_username" in self.model_fields_set:
             _dict['proxy_username'] = None
 
-        # set to None if rate_limit (nullable) is None
-        # and model_fields_set contains the field
-        if self.rate_limit is None and "rate_limit" in self.model_fields_set:
-            _dict['rate_limit'] = None
-
-        # set to None if client_key (nullable) is None
+        # set to None if username (nullable) is None
         # and model_fields_set contains the field
-        if self.client_key is None and "client_key" in self.model_fields_set:
-            _dict['client_key'] = None
+        if self.username is None and "username" in self.model_fields_set:
+            _dict['username'] = None
 
         # set to None if sock_connect_timeout (nullable) is None
         # and model_fields_set contains the field
         if self.sock_connect_timeout is None and "sock_connect_timeout" in self.model_fields_set:
             _dict['sock_connect_timeout'] = None
 
+        # set to None if proxy_password (nullable) is None
+        # and model_fields_set contains the field
+        if self.proxy_password is None and "proxy_password" in self.model_fields_set:
+            _dict['proxy_password'] = None
+
+        # set to None if ca_cert (nullable) is None
+        # and model_fields_set contains the field
+        if self.ca_cert is None and "ca_cert" in self.model_fields_set:
+            _dict['ca_cert'] = None
+
+        # set to None if connect_timeout (nullable) is None
+        # and model_fields_set contains the field
+        if self.connect_timeout is None and "connect_timeout" in self.model_fields_set:
+            _dict['connect_timeout'] = None
+
         return _dict
 
     @classmethod

pulpcore/client/pulp_ansible/models/ansible_git_remote_response.py

@@ -30,29 +30,29 @@ class AnsibleGitRemoteResponse(BaseModel):
     """
     A serializer for Git Collection Remotes.
     """ # noqa: E501
-    hidden_fields: Optional[List[AnsibleCollectionRemoteResponseHiddenFieldsInner]] = Field(default=None, description="List of hidden (write only) fields")
-    total_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.total (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
-    sock_read_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.sock_read (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
-    download_concurrency: Optional[StrictInt] = Field(default=None, description="Total number of simultaneous connections. If not set then the default value will be used.")
+    url: StrictStr = Field(description="The URL of an external content source.")
     max_retries: Optional[StrictInt] = Field(default=None, description="Maximum number of retry attempts after a download failure. If not set then the default value (3) will be used.")
+    proxy_url: Optional[StrictStr] = Field(default=None, description="The proxy URL. Format: scheme://host:port")
+    headers: Optional[List[Dict[str, Any]]] = Field(default=None, description="Headers for aiohttp.Clientsession")
+    name: StrictStr = Field(description="A unique name for this remote.")
+    download_concurrency: Optional[StrictInt] = Field(default=None, description="Total number of simultaneous connections. If not set then the default value will be used.")
     client_cert: Optional[StrictStr] = Field(default=None, description="A PEM encoded client certificate used for authentication.")
+    total_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.total (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     tls_validation: Optional[StrictBool] = Field(default=None, description="If True, TLS peer validation must be performed.")
-    pulp_labels: Optional[Dict[str, Optional[StrictStr]]] = None
-    connect_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.connect (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
-    ca_cert: Optional[StrictStr] = Field(default=None, description="A PEM encoded CA certificate used to validate the server certificate presented by the remote server.")
-    proxy_url: Optional[StrictStr] = Field(default=None, description="The proxy URL. Format: scheme://host:port")
-    prn: Optional[StrictStr] = Field(default=None, description="The Pulp Resource Name (PRN).")
+    pulp_href: Optional[StrictStr] = None
+    sock_read_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.sock_read (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     rate_limit: Optional[StrictInt] = Field(default=None, description="Limits requests per second for each concurrent downloader")
-    headers: Optional[List[Dict[str, Any]]] = Field(default=None, description="Headers for aiohttp.Clientsession")
-    pulp_created: Optional[datetime] = Field(default=None, description="Timestamp of creation.")
     pulp_last_updated: Optional[datetime] = Field(default=None, description="Timestamp of the most recent update of the remote.")
-    url: StrictStr = Field(description="The URL of an external content source.")
-    pulp_href: Optional[StrictStr] = None
     sock_connect_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.sock_connect (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
-    name: StrictStr = Field(description="A unique name for this remote.")
+    hidden_fields: Optional[List[AnsibleCollectionRemoteResponseHiddenFieldsInner]] = Field(default=None, description="List of hidden (write only) fields")
+    pulp_created: Optional[datetime] = Field(default=None, description="Timestamp of creation.")
+    ca_cert: Optional[StrictStr] = Field(default=None, description="A PEM encoded CA certificate used to validate the server certificate presented by the remote server.")
+    prn: Optional[StrictStr] = Field(default=None, description="The Pulp Resource Name (PRN).")
+    pulp_labels: Optional[Dict[str, Optional[StrictStr]]] = None
+    connect_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.connect (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     metadata_only: Optional[StrictBool] = Field(default=None, description="If True, only metadata about the content will be stored in Pulp. Clients will retrieve content from the remote URL.")
     git_ref: Optional[StrictStr] = Field(default=None, description="A git ref. e.g.: branch, tag, or commit sha.")
-    __properties: ClassVar[List[str]] = ["hidden_fields", "total_timeout", "sock_read_timeout", "download_concurrency", "max_retries", "client_cert", "tls_validation", "pulp_labels", "connect_timeout", "ca_cert", "proxy_url", "prn", "rate_limit", "headers", "pulp_created", "pulp_last_updated", "url", "pulp_href", "sock_connect_timeout", "name", "metadata_only", "git_ref"]
+    __properties: ClassVar[List[str]] = ["url", "max_retries", "proxy_url", "headers", "name", "download_concurrency", "client_cert", "total_timeout", "tls_validation", "pulp_href", "sock_read_timeout", "rate_limit", "pulp_last_updated", "sock_connect_timeout", "hidden_fields", "pulp_created", "ca_cert", "prn", "pulp_labels", "connect_timeout", "metadata_only", "git_ref"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -90,10 +90,10 @@ class AnsibleGitRemoteResponse(BaseModel):
         * OpenAPI `readOnly` fields are excluded.
         """
         excluded_fields: Set[str] = set([
-            "prn",
-            "pulp_created",
-            "pulp_last_updated",
             "pulp_href",
+            "pulp_last_updated",
+            "pulp_created",
+            "prn",
         ])
 
         _dict = self.model_dump(
@@ -108,45 +108,35 @@ class AnsibleGitRemoteResponse(BaseModel):
                 if _item_hidden_fields:
                     _items.append(_item_hidden_fields.to_dict())
             _dict['hidden_fields'] = _items
-        # set to None if total_timeout (nullable) is None
+        # set to None if max_retries (nullable) is None
         # and model_fields_set contains the field
-        if self.total_timeout is None and "total_timeout" in self.model_fields_set:
-            _dict['total_timeout'] = None
+        if self.max_retries is None and "max_retries" in self.model_fields_set:
+            _dict['max_retries'] = None
 
-        # set to None if sock_read_timeout (nullable) is None
+        # set to None if proxy_url (nullable) is None
         # and model_fields_set contains the field
-        if self.sock_read_timeout is None and "sock_read_timeout" in self.model_fields_set:
-            _dict['sock_read_timeout'] = None
+        if self.proxy_url is None and "proxy_url" in self.model_fields_set:
+            _dict['proxy_url'] = None
 
         # set to None if download_concurrency (nullable) is None
         # and model_fields_set contains the field
         if self.download_concurrency is None and "download_concurrency" in self.model_fields_set:
             _dict['download_concurrency'] = None
 
-        # set to None if max_retries (nullable) is None
-        # and model_fields_set contains the field
-        if self.max_retries is None and "max_retries" in self.model_fields_set:
-            _dict['max_retries'] = None
-
         # set to None if client_cert (nullable) is None
         # and model_fields_set contains the field
         if self.client_cert is None and "client_cert" in self.model_fields_set:
             _dict['client_cert'] = None
 
-        # set to None if connect_timeout (nullable) is None
-        # and model_fields_set contains the field
-        if self.connect_timeout is None and "connect_timeout" in self.model_fields_set:
-            _dict['connect_timeout'] = None
-
-        # set to None if ca_cert (nullable) is None
+        # set to None if total_timeout (nullable) is None
         # and model_fields_set contains the field
-        if self.ca_cert is None and "ca_cert" in self.model_fields_set:
-            _dict['ca_cert'] = None
+        if self.total_timeout is None and "total_timeout" in self.model_fields_set:
+            _dict['total_timeout'] = None
 
-        # set to None if proxy_url (nullable) is None
+        # set to None if sock_read_timeout (nullable) is None
         # and model_fields_set contains the field
-        if self.proxy_url is None and "proxy_url" in self.model_fields_set:
-            _dict['proxy_url'] = None
+        if self.sock_read_timeout is None and "sock_read_timeout" in self.model_fields_set:
+            _dict['sock_read_timeout'] = None
 
         # set to None if rate_limit (nullable) is None
         # and model_fields_set contains the field
@@ -158,6 +148,16 @@ class AnsibleGitRemoteResponse(BaseModel):
         if self.sock_connect_timeout is None and "sock_connect_timeout" in self.model_fields_set:
             _dict['sock_connect_timeout'] = None
 
+        # set to None if ca_cert (nullable) is None
+        # and model_fields_set contains the field
+        if self.ca_cert is None and "ca_cert" in self.model_fields_set:
+            _dict['ca_cert'] = None
+
+        # set to None if connect_timeout (nullable) is None
+        # and model_fields_set contains the field
+        if self.connect_timeout is None and "connect_timeout" in self.model_fields_set:
+            _dict['connect_timeout'] = None
+
         return _dict
 
     @classmethod

pulpcore/client/pulp_ansible/models/ansible_role_remote.py

@@ -31,6 +31,8 @@ class AnsibleRoleRemote(BaseModel):
     """ # noqa: E501
     name: Annotated[str, Field(min_length=1, strict=True)] = Field(description="A unique name for this remote.")
     url: Annotated[str, Field(min_length=1, strict=True)] = Field(description="The URL of an external content source.")
+    pulp_labels: Optional[Dict[str, Optional[StrictStr]]] = None
+    policy: Optional[PolicyEnum] = Field(default=None, description="The policy to use when downloading content.  * `immediate` - When syncing, download all metadata and content now.")
     ca_cert: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="A PEM encoded CA certificate used to validate the server certificate presented by the remote server.")
     client_cert: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="A PEM encoded client certificate used for authentication.")
     client_key: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="A PEM encoded private key used for authentication.")
@@ -40,17 +42,15 @@ class AnsibleRoleRemote(BaseModel):
     proxy_password: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The password to authenticate to the proxy. Extra leading and trailing whitespace characters are not trimmed.")
     username: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The username to be used for authentication when syncing.")
     password: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The password to be used for authentication when syncing. Extra leading and trailing whitespace characters are not trimmed.")
-    pulp_labels: Optional[Dict[str, Optional[StrictStr]]] = None
-    download_concurrency: Optional[StrictInt] = Field(default=None, description="Total number of simultaneous connections. If not set then the default value will be used.")
     max_retries: Optional[StrictInt] = Field(default=None, description="Maximum number of retry attempts after a download failure. If not set then the default value (3) will be used.")
-    policy: Optional[PolicyEnum] = Field(default=None, description="The policy to use when downloading content.  * `immediate` - When syncing, download all metadata and content now.")
     total_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.total (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     connect_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.connect (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     sock_connect_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.sock_connect (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     sock_read_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.sock_read (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     headers: Optional[List[Dict[str, Any]]] = Field(default=None, description="Headers for aiohttp.Clientsession")
+    download_concurrency: Optional[StrictInt] = Field(default=None, description="Total number of simultaneous connections. If not set then the default value will be used.")
     rate_limit: Optional[StrictInt] = Field(default=None, description="Limits requests per second for each concurrent downloader")
-    __properties: ClassVar[List[str]] = ["name", "url", "ca_cert", "client_cert", "client_key", "tls_validation", "proxy_url", "proxy_username", "proxy_password", "username", "password", "pulp_labels", "download_concurrency", "max_retries", "policy", "total_timeout", "connect_timeout", "sock_connect_timeout", "sock_read_timeout", "headers", "rate_limit"]
+    __properties: ClassVar[List[str]] = ["name", "url", "pulp_labels", "policy", "ca_cert", "client_cert", "client_key", "tls_validation", "proxy_url", "proxy_username", "proxy_password", "username", "password", "max_retries", "total_timeout", "connect_timeout", "sock_connect_timeout", "sock_read_timeout", "headers", "download_concurrency", "rate_limit"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -131,11 +131,6 @@ class AnsibleRoleRemote(BaseModel):
         if self.password is None and "password" in self.model_fields_set:
             _dict['password'] = None
 
-        # set to None if download_concurrency (nullable) is None
-        # and model_fields_set contains the field
-        if self.download_concurrency is None and "download_concurrency" in self.model_fields_set:
-            _dict['download_concurrency'] = None
-
         # set to None if max_retries (nullable) is None
         # and model_fields_set contains the field
         if self.max_retries is None and "max_retries" in self.model_fields_set:
@@ -161,6 +156,11 @@ class AnsibleRoleRemote(BaseModel):
         if self.sock_read_timeout is None and "sock_read_timeout" in self.model_fields_set:
             _dict['sock_read_timeout'] = None
 
+        # set to None if download_concurrency (nullable) is None
+        # and model_fields_set contains the field
+        if self.download_concurrency is None and "download_concurrency" in self.model_fields_set:
+            _dict['download_concurrency'] = None
+
         # set to None if rate_limit (nullable) is None
         # and model_fields_set contains the field
         if self.rate_limit is None and "rate_limit" in self.model_fields_set:

pulpcore/client/pulp_ansible/models/ansible_role_remote_response.py

@@ -37,22 +37,22 @@ class AnsibleRoleRemoteResponse(BaseModel):
     pulp_last_updated: Optional[datetime] = Field(default=None, description="Timestamp of the most recent update of the remote.")
     name: StrictStr = Field(description="A unique name for this remote.")
     url: StrictStr = Field(description="The URL of an external content source.")
+    pulp_labels: Optional[Dict[str, Optional[StrictStr]]] = None
+    policy: Optional[PolicyEnum] = Field(default=None, description="The policy to use when downloading content.  * `immediate` - When syncing, download all metadata and content now.")
+    hidden_fields: Optional[List[AnsibleCollectionRemoteResponseHiddenFieldsInner]] = Field(default=None, description="List of hidden (write only) fields")
     ca_cert: Optional[StrictStr] = Field(default=None, description="A PEM encoded CA certificate used to validate the server certificate presented by the remote server.")
     client_cert: Optional[StrictStr] = Field(default=None, description="A PEM encoded client certificate used for authentication.")
     tls_validation: Optional[StrictBool] = Field(default=None, description="If True, TLS peer validation must be performed.")
     proxy_url: Optional[StrictStr] = Field(default=None, description="The proxy URL. Format: scheme://host:port")
-    pulp_labels: Optional[Dict[str, Optional[StrictStr]]] = None
-    download_concurrency: Optional[StrictInt] = Field(default=None, description="Total number of simultaneous connections. If not set then the default value will be used.")
     max_retries: Optional[StrictInt] = Field(default=None, description="Maximum number of retry attempts after a download failure. If not set then the default value (3) will be used.")
-    policy: Optional[PolicyEnum] = Field(default=None, description="The policy to use when downloading content.  * `immediate` - When syncing, download all metadata and content now.")
     total_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.total (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     connect_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.connect (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     sock_connect_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.sock_connect (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     sock_read_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.sock_read (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     headers: Optional[List[Dict[str, Any]]] = Field(default=None, description="Headers for aiohttp.Clientsession")
+    download_concurrency: Optional[StrictInt] = Field(default=None, description="Total number of simultaneous connections. If not set then the default value will be used.")
     rate_limit: Optional[StrictInt] = Field(default=None, description="Limits requests per second for each concurrent downloader")
-    hidden_fields: Optional[List[AnsibleCollectionRemoteResponseHiddenFieldsInner]] = Field(default=None, description="List of hidden (write only) fields")
-    __properties: ClassVar[List[str]] = ["pulp_href", "prn", "pulp_created", "pulp_last_updated", "name", "url", "ca_cert", "client_cert", "tls_validation", "proxy_url", "pulp_labels", "download_concurrency", "max_retries", "policy", "total_timeout", "connect_timeout", "sock_connect_timeout", "sock_read_timeout", "headers", "rate_limit", "hidden_fields"]
+    __properties: ClassVar[List[str]] = ["pulp_href", "prn", "pulp_created", "pulp_last_updated", "name", "url", "pulp_labels", "policy", "hidden_fields", "ca_cert", "client_cert", "tls_validation", "proxy_url", "max_retries", "total_timeout", "connect_timeout", "sock_connect_timeout", "sock_read_timeout", "headers", "download_concurrency", "rate_limit"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -123,11 +123,6 @@ class AnsibleRoleRemoteResponse(BaseModel):
         if self.proxy_url is None and "proxy_url" in self.model_fields_set:
             _dict['proxy_url'] = None
 
-        # set to None if download_concurrency (nullable) is None
-        # and model_fields_set contains the field
-        if self.download_concurrency is None and "download_concurrency" in self.model_fields_set:
-            _dict['download_concurrency'] = None
-
         # set to None if max_retries (nullable) is None
         # and model_fields_set contains the field
         if self.max_retries is None and "max_retries" in self.model_fields_set:
@@ -153,6 +148,11 @@ class AnsibleRoleRemoteResponse(BaseModel):
         if self.sock_read_timeout is None and "sock_read_timeout" in self.model_fields_set:
             _dict['sock_read_timeout'] = None
 
+        # set to None if download_concurrency (nullable) is None
+        # and model_fields_set contains the field
+        if self.download_concurrency is None and "download_concurrency" in self.model_fields_set:
+            _dict['download_concurrency'] = None
+
         # set to None if rate_limit (nullable) is None
         # and model_fields_set contains the field
         if self.rate_limit is None and "rate_limit" in self.model_fields_set:

pulpcore/client/pulp_ansible/models/ansible_role_response.py

@@ -28,17 +28,17 @@ class AnsibleRoleResponse(BaseModel):
     """
     A serializer for Role versions.
     """ # noqa: E501
+    pulp_last_updated: Optional[datetime] = Field(default=None, description="Timestamp of the last time this resource was updated. Note: for immutable resources - like content, repository versions, and publication - pulp_created and pulp_last_updated dates will be the same.")
     pulp_created: Optional[datetime] = Field(default=None, description="Timestamp of creation.")
+    pulp_href: Optional[StrictStr] = None
     artifact: StrictStr = Field(description="Artifact file representing the physical content")
-    pulp_labels: Optional[Dict[str, Optional[StrictStr]]] = Field(default=None, description="A dictionary of arbitrary key/value pairs used to describe a specific Content instance.")
-    pulp_last_updated: Optional[datetime] = Field(default=None, description="Timestamp of the last time this resource was updated. Note: for immutable resources - like content, repository versions, and publication - pulp_created and pulp_last_updated dates will be the same.")
     vuln_report: Optional[StrictStr] = None
-    pulp_href: Optional[StrictStr] = None
     prn: Optional[StrictStr] = Field(default=None, description="The Pulp Resource Name (PRN).")
+    pulp_labels: Optional[Dict[str, Optional[StrictStr]]] = Field(default=None, description="A dictionary of arbitrary key/value pairs used to describe a specific Content instance.")
     version: StrictStr
     name: StrictStr
     namespace: StrictStr
-    __properties: ClassVar[List[str]] = ["pulp_created", "artifact", "pulp_labels", "pulp_last_updated", "vuln_report", "pulp_href", "prn", "version", "name", "namespace"]
+    __properties: ClassVar[List[str]] = ["pulp_last_updated", "pulp_created", "pulp_href", "artifact", "vuln_report", "prn", "pulp_labels", "version", "name", "namespace"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -77,10 +77,10 @@ class AnsibleRoleResponse(BaseModel):
         * OpenAPI `readOnly` fields are excluded.
         """
         excluded_fields: Set[str] = set([
-            "pulp_created",
             "pulp_last_updated",
-            "vuln_report",
+            "pulp_created",
             "pulp_href",
+            "vuln_report",
             "prn",
         ])
 

pulpcore/client/pulp_ansible/models/patchedansible_collection_remote.py

@@ -31,6 +31,8 @@ class PatchedansibleCollectionRemote(BaseModel):
     """ # noqa: E501
     name: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="A unique name for this remote.")
     url: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The URL of an external content source.")
+    pulp_labels: Optional[Dict[str, Optional[StrictStr]]] = None
+    policy: Optional[PolicyEnum] = Field(default=None, description="The policy to use when downloading content.  * `immediate` - When syncing, download all metadata and content now.")
     ca_cert: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="A PEM encoded CA certificate used to validate the server certificate presented by the remote server.")
     client_cert: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="A PEM encoded client certificate used for authentication.")
     client_key: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="A PEM encoded private key used for authentication.")
@@ -40,22 +42,20 @@ class PatchedansibleCollectionRemote(BaseModel):
     proxy_password: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The password to authenticate to the proxy. Extra leading and trailing whitespace characters are not trimmed.")
     username: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The username to be used for authentication when syncing.")
     password: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The password to be used for authentication when syncing. Extra leading and trailing whitespace characters are not trimmed.")
-    pulp_labels: Optional[Dict[str, Optional[StrictStr]]] = None
-    download_concurrency: Optional[StrictInt] = Field(default=None, description="Total number of simultaneous connections. If not set then the default value will be used.")
     max_retries: Optional[StrictInt] = Field(default=None, description="Maximum number of retry attempts after a download failure. If not set then the default value (3) will be used.")
-    policy: Optional[PolicyEnum] = Field(default=None, description="The policy to use when downloading content.  * `immediate` - When syncing, download all metadata and content now.")
     total_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.total (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     connect_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.connect (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     sock_connect_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.sock_connect (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     sock_read_timeout: Optional[Union[Annotated[float, Field(strict=True, ge=0.0)], Annotated[int, Field(strict=True, ge=0)]]] = Field(default=None, description="aiohttp.ClientTimeout.sock_read (q.v.) for download-connections. The default is null, which will cause the default from the aiohttp library to be used.")
     headers: Optional[List[Dict[str, Any]]] = Field(default=None, description="Headers for aiohttp.Clientsession")
+    download_concurrency: Optional[StrictInt] = Field(default=None, description="Total number of simultaneous connections. If not set then the default value will be used.")
     rate_limit: Optional[StrictInt] = Field(default=None, description="Limits requests per second for each concurrent downloader")
     requirements_file: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The string version of Collection requirements yaml.")
     auth_url: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The URL to receive a session token from, e.g. used with Automation Hub.")
     token: Optional[Annotated[str, Field(min_length=1, strict=True)]] = Field(default=None, description="The token key to use for authentication. See https://docs.ansible.com/ansible/latest/user_guide/collections_using.html#configuring-the-ansible-galaxy-clientfor more details")
     sync_dependencies: Optional[StrictBool] = Field(default=None, description="Sync dependencies for collections specified via requirements file")
     signed_only: Optional[StrictBool] = Field(default=None, description="Sync only collections that have a signature")
-    __properties: ClassVar[List[str]] = ["name", "url", "ca_cert", "client_cert", "client_key", "tls_validation", "proxy_url", "proxy_username", "proxy_password", "username", "password", "pulp_labels", "download_concurrency", "max_retries", "policy", "total_timeout", "connect_timeout", "sock_connect_timeout", "sock_read_timeout", "headers", "rate_limit", "requirements_file", "auth_url", "token", "sync_dependencies", "signed_only"]
+    __properties: ClassVar[List[str]] = ["name", "url", "pulp_labels", "policy", "ca_cert", "client_cert", "client_key", "tls_validation", "proxy_url", "proxy_username", "proxy_password", "username", "password", "max_retries", "total_timeout", "connect_timeout", "sock_connect_timeout", "sock_read_timeout", "headers", "download_concurrency", "rate_limit", "requirements_file", "auth_url", "token", "sync_dependencies", "signed_only"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -136,11 +136,6 @@ class PatchedansibleCollectionRemote(BaseModel):
         if self.password is None and "password" in self.model_fields_set:
             _dict['password'] = None
 
-        # set to None if download_concurrency (nullable) is None
-        # and model_fields_set contains the field
-        if self.download_concurrency is None and "download_concurrency" in self.model_fields_set:
-            _dict['download_concurrency'] = None
-
         # set to None if max_retries (nullable) is None
         # and model_fields_set contains the field
         if self.max_retries is None and "max_retries" in self.model_fields_set:
@@ -166,6 +161,11 @@ class PatchedansibleCollectionRemote(BaseModel):
         if self.sock_read_timeout is None and "sock_read_timeout" in self.model_fields_set:
             _dict['sock_read_timeout'] = None
 
+        # set to None if download_concurrency (nullable) is None
+        # and model_fields_set contains the field
+        if self.download_concurrency is None and "download_concurrency" in self.model_fields_set:
+            _dict['download_concurrency'] = None
+
         # set to None if rate_limit (nullable) is None
         # and model_fields_set contains the field
         if self.rate_limit is None and "rate_limit" in self.model_fields_set: