From af2ed75f0e6fdca70453ffbaa84af711ceb6f143 Mon Sep 17 00:00:00 2001 From: ff137 Date: Fri, 10 Nov 2023 10:56:58 +0200 Subject: [PATCH 1/9] add postprocessing to fix cases where `Union[str,Any]` should be `Dict[str,Any]` --- generator/scripts/postprocess-client.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/generator/scripts/postprocess-client.sh b/generator/scripts/postprocess-client.sh index 3bf4c62a..ff4c63bf 100755 --- a/generator/scripts/postprocess-client.sh +++ b/generator/scripts/postprocess-client.sh @@ -54,6 +54,9 @@ sed -i -e 's/context: List\[Union\[str, Any\]\]/context: List\[Union\[str, Dict\ # Fix type in invitation_message.py: "Any" type in services should be a dict sed -i 's/services: Optional\[List\[Union\[str, Any\]\]\]/services: Optional\[List\[Union\[str, Dict\]\]\]/g' aries_cloudcontroller/models/invitation_message.py +# Fix Union[str,Any] should be Dict[str,Any]! Most of them are wrapped in Optional[..] and some in List[..]. But all can safely be replaced (there are no valid Union[str, Any]'s, all must be Dict) +sed -i 's/Union\[str, Any\]/Dict[str, Any]/g' aries_cloudcontroller/models/*.py + # NB: # There are 3 more models, and 1 API Module, that we are not amending automatically. These should be reviewed manually: # - MultitenancyAPI has custom method to handle our groups plugin! From 884528614d4b711ca8f194eeaca4d44121d213b1 Mon Sep 17 00:00:00 2001 From: ff137 Date: Fri, 10 Nov 2023 10:57:25 +0200 Subject: [PATCH 2/9] :art: correct all `Union[str, Any]` types to `Dict[str, Any]` --- aries_cloudcontroller/models/admin_config.py | 2 +- aries_cloudcontroller/models/admin_status.py | 6 ++---- aries_cloudcontroller/models/claim_format.py | 12 ++++++------ aries_cloudcontroller/models/connection_metadata.py | 2 +- .../models/connection_metadata_set_request.py | 2 +- .../models/create_invitation_request.py | 2 +- .../models/create_wallet_request.py | 2 +- .../models/create_wallet_response.py | 2 +- .../models/cred_rev_indy_records_result.py | 2 +- aries_cloudcontroller/models/credential.py | 2 +- aries_cloudcontroller/models/dif_pres_spec.py | 4 ++-- aries_cloudcontroller/models/disclosures.py | 2 +- aries_cloudcontroller/models/doc.py | 2 +- aries_cloudcontroller/models/indy_cred_request.py | 4 ++-- aries_cloudcontroller/models/indy_credential.py | 8 ++++---- .../models/indy_proof_requested_proof.py | 4 ++-- aries_cloudcontroller/models/input_descriptors.py | 2 +- .../models/invitation_create_request.py | 2 +- aries_cloudcontroller/models/jws_create.py | 4 ++-- aries_cloudcontroller/models/jws_verify_response.py | 4 ++-- aries_cloudcontroller/models/keylist_query.py | 2 +- .../models/keylist_query_filter_request.py | 2 +- aries_cloudcontroller/models/profile_settings.py | 2 +- aries_cloudcontroller/models/resolution_result.py | 4 ++-- .../models/rev_reg_wallet_updated_result.py | 6 +++--- aries_cloudcontroller/models/sign_response.py | 2 +- aries_cloudcontroller/models/transaction_record.py | 10 +++++----- .../models/update_profile_settings.py | 2 +- .../models/update_wallet_request.py | 2 +- .../models/v10_credential_exchange.py | 2 +- .../models/v20_cred_ex_record_by_format.py | 8 ++++---- .../models/v20_cred_ex_record_indy.py | 2 +- .../models/v20_pres_ex_record_by_format.py | 6 +++--- aries_cloudcontroller/models/vc_record.py | 2 +- aries_cloudcontroller/models/wallet_record.py | 2 +- 35 files changed, 61 insertions(+), 63 deletions(-) diff --git a/aries_cloudcontroller/models/admin_config.py b/aries_cloudcontroller/models/admin_config.py index 2d1f150b..5dc39cf2 100644 --- a/aries_cloudcontroller/models/admin_config.py +++ b/aries_cloudcontroller/models/admin_config.py @@ -33,7 +33,7 @@ class AdminConfig(BaseModel): AdminConfig """ - config: Optional[Union[str, Any]] = Field( + config: Optional[Dict[str, Any]] = Field( default=None, description="Configuration settings" ) __properties: ClassVar[List[str]] = ["config"] diff --git a/aries_cloudcontroller/models/admin_status.py b/aries_cloudcontroller/models/admin_status.py index b772fad6..ae7848e5 100644 --- a/aries_cloudcontroller/models/admin_status.py +++ b/aries_cloudcontroller/models/admin_status.py @@ -33,13 +33,11 @@ class AdminStatus(BaseModel): AdminStatus """ - conductor: Optional[Union[str, Any]] = Field( + conductor: Optional[Dict[str, Any]] = Field( default=None, description="Conductor statistics" ) label: Optional[StrictStr] = Field(default=None, description="Default label") - timing: Optional[Union[str, Any]] = Field( - default=None, description="Timing results" - ) + timing: Optional[Dict[str, Any]] = Field(default=None, description="Timing results") version: Optional[StrictStr] = Field(default=None, description="Version code") __properties: ClassVar[List[str]] = ["conductor", "label", "timing", "version"] diff --git a/aries_cloudcontroller/models/claim_format.py b/aries_cloudcontroller/models/claim_format.py index 38c52a26..ae3a8e9a 100644 --- a/aries_cloudcontroller/models/claim_format.py +++ b/aries_cloudcontroller/models/claim_format.py @@ -33,12 +33,12 @@ class ClaimFormat(BaseModel): ClaimFormat """ - jwt: Optional[Union[str, Any]] = None - jwt_vc: Optional[Union[str, Any]] = None - jwt_vp: Optional[Union[str, Any]] = None - ldp: Optional[Union[str, Any]] = None - ldp_vc: Optional[Union[str, Any]] = None - ldp_vp: Optional[Union[str, Any]] = None + jwt: Optional[Dict[str, Any]] = None + jwt_vc: Optional[Dict[str, Any]] = None + jwt_vp: Optional[Dict[str, Any]] = None + ldp: Optional[Dict[str, Any]] = None + ldp_vc: Optional[Dict[str, Any]] = None + ldp_vp: Optional[Dict[str, Any]] = None __properties: ClassVar[List[str]] = [ "jwt", "jwt_vc", diff --git a/aries_cloudcontroller/models/connection_metadata.py b/aries_cloudcontroller/models/connection_metadata.py index 41b4350d..80873399 100644 --- a/aries_cloudcontroller/models/connection_metadata.py +++ b/aries_cloudcontroller/models/connection_metadata.py @@ -33,7 +33,7 @@ class ConnectionMetadata(BaseModel): ConnectionMetadata """ - results: Optional[Union[str, Any]] = Field( + results: Optional[Dict[str, Any]] = Field( default=None, description="Dictionary of metadata associated with connection." ) __properties: ClassVar[List[str]] = ["results"] diff --git a/aries_cloudcontroller/models/connection_metadata_set_request.py b/aries_cloudcontroller/models/connection_metadata_set_request.py index bc829b2c..b64a499e 100644 --- a/aries_cloudcontroller/models/connection_metadata_set_request.py +++ b/aries_cloudcontroller/models/connection_metadata_set_request.py @@ -33,7 +33,7 @@ class ConnectionMetadataSetRequest(BaseModel): ConnectionMetadataSetRequest """ - metadata: Union[str, Any] = Field( + metadata: Dict[str, Any] = Field( description="Dictionary of metadata to set for connection." ) __properties: ClassVar[List[str]] = ["metadata"] diff --git a/aries_cloudcontroller/models/create_invitation_request.py b/aries_cloudcontroller/models/create_invitation_request.py index 6884113f..dfe7956a 100644 --- a/aries_cloudcontroller/models/create_invitation_request.py +++ b/aries_cloudcontroller/models/create_invitation_request.py @@ -38,7 +38,7 @@ class CreateInvitationRequest(BaseModel): mediation_id: Optional[Annotated[str, Field(strict=True)]] = Field( default=None, description="Identifier for active mediation record to be used" ) - metadata: Optional[Union[str, Any]] = Field( + metadata: Optional[Dict[str, Any]] = Field( default=None, description="Optional metadata to attach to the connection created with the invitation", ) diff --git a/aries_cloudcontroller/models/create_wallet_request.py b/aries_cloudcontroller/models/create_wallet_request.py index 8d0e9027..eafa7435 100644 --- a/aries_cloudcontroller/models/create_wallet_request.py +++ b/aries_cloudcontroller/models/create_wallet_request.py @@ -33,7 +33,7 @@ class CreateWalletRequest(BaseModel): CreateWalletRequest """ - extra_settings: Optional[Union[str, Any]] = Field( + extra_settings: Optional[Dict[str, Any]] = Field( default=None, description="Agent config key-value pairs" ) image_url: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/create_wallet_response.py b/aries_cloudcontroller/models/create_wallet_response.py index ba295ad2..8a26ca75 100644 --- a/aries_cloudcontroller/models/create_wallet_response.py +++ b/aries_cloudcontroller/models/create_wallet_response.py @@ -41,7 +41,7 @@ class CreateWalletResponse(BaseModel): key_management_mode: StrictStr = Field( description="Mode regarding management of wallet key" ) - settings: Optional[Union[str, Any]] = Field( + settings: Optional[Dict[str, Any]] = Field( default=None, description="Settings for this wallet." ) state: Optional[StrictStr] = Field(default=None, description="Current record state") diff --git a/aries_cloudcontroller/models/cred_rev_indy_records_result.py b/aries_cloudcontroller/models/cred_rev_indy_records_result.py index 19c3c1dc..1982bb3a 100644 --- a/aries_cloudcontroller/models/cred_rev_indy_records_result.py +++ b/aries_cloudcontroller/models/cred_rev_indy_records_result.py @@ -33,7 +33,7 @@ class CredRevIndyRecordsResult(BaseModel): CredRevIndyRecordsResult """ - rev_reg_delta: Optional[Union[str, Any]] = Field( + rev_reg_delta: Optional[Dict[str, Any]] = Field( default=None, description="Indy revocation registry delta" ) __properties: ClassVar[List[str]] = ["rev_reg_delta"] diff --git a/aries_cloudcontroller/models/credential.py b/aries_cloudcontroller/models/credential.py index c56ddc64..9157b8c2 100644 --- a/aries_cloudcontroller/models/credential.py +++ b/aries_cloudcontroller/models/credential.py @@ -39,7 +39,7 @@ class Credential(BaseModel): context: List[Union[str, Dict]] = Field( description="The JSON-LD context of the credential", alias="@context" ) - credential_subject: Union[str, Any] = Field(alias="credentialSubject") + credential_subject: Dict[str, Any] = Field(alias="credentialSubject") expiration_date: Optional[Annotated[str, Field(strict=True)]] = Field( default=None, description="The expiration date", alias="expirationDate" ) diff --git a/aries_cloudcontroller/models/dif_pres_spec.py b/aries_cloudcontroller/models/dif_pres_spec.py index c7f2d117..1d084cbe 100644 --- a/aries_cloudcontroller/models/dif_pres_spec.py +++ b/aries_cloudcontroller/models/dif_pres_spec.py @@ -39,11 +39,11 @@ class DIFPresSpec(BaseModel): description="Issuer identifier to sign the presentation, if different from current public DID", ) presentation_definition: Optional[PresentationDefinition] = None - record_ids: Optional[Union[str, Any]] = Field( + record_ids: Optional[Dict[str, Any]] = Field( default=None, description="Mapping of input_descriptor id to list of stored W3C credential record_id", ) - reveal_doc: Optional[Union[str, Any]] = Field( + reveal_doc: Optional[Dict[str, Any]] = Field( default=None, description="reveal doc [JSON-LD frame] dict used to derive the credential when selective disclosure is required", ) diff --git a/aries_cloudcontroller/models/disclosures.py b/aries_cloudcontroller/models/disclosures.py index ecf60f34..d0329841 100644 --- a/aries_cloudcontroller/models/disclosures.py +++ b/aries_cloudcontroller/models/disclosures.py @@ -39,7 +39,7 @@ class Disclosures(BaseModel): type: Optional[StrictStr] = Field( default=None, description="Message type", alias="@type" ) - disclosures: List[Union[str, Any]] = Field( + disclosures: List[Dict[str, Any]] = Field( description="List of protocol or goal_code descriptors" ) __properties: ClassVar[List[str]] = ["@id", "@type", "disclosures"] diff --git a/aries_cloudcontroller/models/doc.py b/aries_cloudcontroller/models/doc.py index c9b074ae..2dd376b3 100644 --- a/aries_cloudcontroller/models/doc.py +++ b/aries_cloudcontroller/models/doc.py @@ -34,7 +34,7 @@ class Doc(BaseModel): Doc """ - credential: Union[str, Any] = Field(description="Credential to sign") + credential: Dict[str, Any] = Field(description="Credential to sign") options: SignatureOptions __properties: ClassVar[List[str]] = ["credential", "options"] diff --git a/aries_cloudcontroller/models/indy_cred_request.py b/aries_cloudcontroller/models/indy_cred_request.py index 3b58b17c..1b05004a 100644 --- a/aries_cloudcontroller/models/indy_cred_request.py +++ b/aries_cloudcontroller/models/indy_cred_request.py @@ -35,8 +35,8 @@ class IndyCredRequest(BaseModel): IndyCredRequest """ - blinded_ms: Union[str, Any] = Field(description="Blinded master secret") - blinded_ms_correctness_proof: Union[str, Any] = Field( + blinded_ms: Dict[str, Any] = Field(description="Blinded master secret") + blinded_ms_correctness_proof: Dict[str, Any] = Field( description="Blinded master secret correctness proof" ) cred_def_id: Annotated[str, Field(strict=True)] = Field( diff --git a/aries_cloudcontroller/models/indy_credential.py b/aries_cloudcontroller/models/indy_credential.py index 759a6406..f3b517ed 100644 --- a/aries_cloudcontroller/models/indy_credential.py +++ b/aries_cloudcontroller/models/indy_credential.py @@ -39,7 +39,7 @@ class IndyCredential(BaseModel): cred_def_id: Annotated[str, Field(strict=True)] = Field( description="Credential definition identifier" ) - rev_reg: Optional[Union[str, Any]] = Field( + rev_reg: Optional[Dict[str, Any]] = Field( default=None, description="Revocation registry state" ) rev_reg_id: Optional[Annotated[str, Field(strict=True)]] = Field( @@ -48,12 +48,12 @@ class IndyCredential(BaseModel): schema_id: Annotated[str, Field(strict=True)] = Field( description="Schema identifier" ) - signature: Union[str, Any] = Field(description="Credential signature") - signature_correctness_proof: Union[str, Any] = Field( + signature: Dict[str, Any] = Field(description="Credential signature") + signature_correctness_proof: Dict[str, Any] = Field( description="Credential signature correctness proof" ) values: Dict[str, IndyAttrValue] = Field(description="Credential attributes") - witness: Optional[Union[str, Any]] = Field( + witness: Optional[Dict[str, Any]] = Field( default=None, description="Witness for revocation proof" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/indy_proof_requested_proof.py b/aries_cloudcontroller/models/indy_proof_requested_proof.py index 452e90e8..cc32d77b 100644 --- a/aries_cloudcontroller/models/indy_proof_requested_proof.py +++ b/aries_cloudcontroller/models/indy_proof_requested_proof.py @@ -53,10 +53,10 @@ class IndyProofRequestedProof(BaseModel): revealed_attrs: Optional[Dict[str, IndyProofRequestedProofRevealedAttr]] = Field( default=None, description="Proof requested proof revealed attributes" ) - self_attested_attrs: Optional[Union[str, Any]] = Field( + self_attested_attrs: Optional[Dict[str, Any]] = Field( default=None, description="Proof requested proof self-attested attributes" ) - unrevealed_attrs: Optional[Union[str, Any]] = Field( + unrevealed_attrs: Optional[Dict[str, Any]] = Field( default=None, description="Unrevealed attributes" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/input_descriptors.py b/aries_cloudcontroller/models/input_descriptors.py index 5d0665e8..64bfedde 100644 --- a/aries_cloudcontroller/models/input_descriptors.py +++ b/aries_cloudcontroller/models/input_descriptors.py @@ -40,7 +40,7 @@ class InputDescriptors(BaseModel): constraints: Optional[Constraints] = None group: Optional[List[StrictStr]] = None id: Optional[StrictStr] = Field(default=None, description="ID") - metadata: Optional[Union[str, Any]] = Field( + metadata: Optional[Dict[str, Any]] = Field( default=None, description="Metadata dictionary" ) name: Optional[StrictStr] = Field(default=None, description="Name") diff --git a/aries_cloudcontroller/models/invitation_create_request.py b/aries_cloudcontroller/models/invitation_create_request.py index e45f4823..bc39698c 100644 --- a/aries_cloudcontroller/models/invitation_create_request.py +++ b/aries_cloudcontroller/models/invitation_create_request.py @@ -56,7 +56,7 @@ class InvitationCreateRequest(BaseModel): mediation_id: Optional[Annotated[str, Field(strict=True)]] = Field( default=None, description="Identifier for active mediation record to be used" ) - metadata: Optional[Union[str, Any]] = Field( + metadata: Optional[Dict[str, Any]] = Field( default=None, description="Optional metadata to attach to the connection created with the invitation", ) diff --git a/aries_cloudcontroller/models/jws_create.py b/aries_cloudcontroller/models/jws_create.py index e7f866cb..9a0d6072 100644 --- a/aries_cloudcontroller/models/jws_create.py +++ b/aries_cloudcontroller/models/jws_create.py @@ -38,8 +38,8 @@ class JWSCreate(BaseModel): did: Optional[Annotated[str, Field(strict=True)]] = Field( default=None, description="DID of interest" ) - headers: Optional[Union[str, Any]] = None - payload: Union[str, Any] + headers: Optional[Dict[str, Any]] = None + payload: Dict[str, Any] verification_method: Optional[Annotated[str, Field(strict=True)]] = Field( default=None, description="Information used for proof verification", diff --git a/aries_cloudcontroller/models/jws_verify_response.py b/aries_cloudcontroller/models/jws_verify_response.py index f152f74b..b7cc4b4e 100644 --- a/aries_cloudcontroller/models/jws_verify_response.py +++ b/aries_cloudcontroller/models/jws_verify_response.py @@ -34,9 +34,9 @@ class JWSVerifyResponse(BaseModel): """ error: Optional[StrictStr] = Field(default=None, description="Error text") - headers: Union[str, Any] = Field(description="Headers from verified JWT.") + headers: Dict[str, Any] = Field(description="Headers from verified JWT.") kid: StrictStr = Field(description="kid of signer") - payload: Union[str, Any] = Field(description="Payload from verified JWT") + payload: Dict[str, Any] = Field(description="Payload from verified JWT") valid: StrictBool __properties: ClassVar[List[str]] = ["error", "headers", "kid", "payload", "valid"] diff --git a/aries_cloudcontroller/models/keylist_query.py b/aries_cloudcontroller/models/keylist_query.py index 00982320..528765e0 100644 --- a/aries_cloudcontroller/models/keylist_query.py +++ b/aries_cloudcontroller/models/keylist_query.py @@ -40,7 +40,7 @@ class KeylistQuery(BaseModel): type: Optional[StrictStr] = Field( default=None, description="Message type", alias="@type" ) - filter: Optional[Union[str, Any]] = Field( + filter: Optional[Dict[str, Any]] = Field( default=None, description="Query dictionary object" ) paginate: Optional[KeylistQueryPaginate] = None diff --git a/aries_cloudcontroller/models/keylist_query_filter_request.py b/aries_cloudcontroller/models/keylist_query_filter_request.py index 760d4809..24c2a4e0 100644 --- a/aries_cloudcontroller/models/keylist_query_filter_request.py +++ b/aries_cloudcontroller/models/keylist_query_filter_request.py @@ -33,7 +33,7 @@ class KeylistQueryFilterRequest(BaseModel): KeylistQueryFilterRequest """ - filter: Optional[Union[str, Any]] = Field( + filter: Optional[Dict[str, Any]] = Field( default=None, description="Filter for keylist query" ) __properties: ClassVar[List[str]] = ["filter"] diff --git a/aries_cloudcontroller/models/profile_settings.py b/aries_cloudcontroller/models/profile_settings.py index 82022207..9de23f3c 100644 --- a/aries_cloudcontroller/models/profile_settings.py +++ b/aries_cloudcontroller/models/profile_settings.py @@ -33,7 +33,7 @@ class ProfileSettings(BaseModel): ProfileSettings """ - settings: Optional[Union[str, Any]] = Field( + settings: Optional[Dict[str, Any]] = Field( default=None, description="Profile settings dict" ) __properties: ClassVar[List[str]] = ["settings"] diff --git a/aries_cloudcontroller/models/resolution_result.py b/aries_cloudcontroller/models/resolution_result.py index abcbe72d..c95270e5 100644 --- a/aries_cloudcontroller/models/resolution_result.py +++ b/aries_cloudcontroller/models/resolution_result.py @@ -33,8 +33,8 @@ class ResolutionResult(BaseModel): ResolutionResult """ - did_document: Union[str, Any] = Field(description="DID Document") - metadata: Union[str, Any] = Field(description="Resolution metadata") + did_document: Dict[str, Any] = Field(description="DID Document") + metadata: Dict[str, Any] = Field(description="Resolution metadata") __properties: ClassVar[List[str]] = ["did_document", "metadata"] model_config = DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/rev_reg_wallet_updated_result.py b/aries_cloudcontroller/models/rev_reg_wallet_updated_result.py index 957098aa..65a3d816 100644 --- a/aries_cloudcontroller/models/rev_reg_wallet_updated_result.py +++ b/aries_cloudcontroller/models/rev_reg_wallet_updated_result.py @@ -33,13 +33,13 @@ class RevRegWalletUpdatedResult(BaseModel): RevRegWalletUpdatedResult """ - accum_calculated: Optional[Union[str, Any]] = Field( + accum_calculated: Optional[Dict[str, Any]] = Field( default=None, description="Calculated accumulator for phantom revocations" ) - accum_fixed: Optional[Union[str, Any]] = Field( + accum_fixed: Optional[Dict[str, Any]] = Field( default=None, description="Applied ledger transaction to fix revocations" ) - rev_reg_delta: Optional[Union[str, Any]] = Field( + rev_reg_delta: Optional[Dict[str, Any]] = Field( default=None, description="Indy revocation registry delta" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/sign_response.py b/aries_cloudcontroller/models/sign_response.py index 3bd73531..8ef2c364 100644 --- a/aries_cloudcontroller/models/sign_response.py +++ b/aries_cloudcontroller/models/sign_response.py @@ -34,7 +34,7 @@ class SignResponse(BaseModel): """ error: Optional[StrictStr] = Field(default=None, description="Error text") - signed_doc: Optional[Union[str, Any]] = Field( + signed_doc: Optional[Dict[str, Any]] = Field( default=None, description="Signed document" ) __properties: ClassVar[List[str]] = ["error", "signed_doc"] diff --git a/aries_cloudcontroller/models/transaction_record.py b/aries_cloudcontroller/models/transaction_record.py index dab11cbb..61f83500 100644 --- a/aries_cloudcontroller/models/transaction_record.py +++ b/aries_cloudcontroller/models/transaction_record.py @@ -50,15 +50,15 @@ class TransactionRecord(BaseModel): description="If True, Endorser will write the transaction after endorsing it", ) formats: Optional[List[Dict[str, StrictStr]]] = None - messages_attach: Optional[List[Union[str, Any]]] = None - meta_data: Optional[Union[str, Any]] = None - signature_request: Optional[List[Union[str, Any]]] = None - signature_response: Optional[List[Union[str, Any]]] = None + messages_attach: Optional[List[Dict[str, Any]]] = None + meta_data: Optional[Dict[str, Any]] = None + signature_request: Optional[List[Dict[str, Any]]] = None + signature_response: Optional[List[Dict[str, Any]]] = None state: Optional[StrictStr] = Field(default=None, description="Current record state") thread_id: Optional[StrictStr] = Field( default=None, description="Thread Identifier" ) - timing: Optional[Union[str, Any]] = None + timing: Optional[Dict[str, Any]] = None trace: Optional[StrictBool] = Field( default=None, description="Record trace information, based on agent configuration", diff --git a/aries_cloudcontroller/models/update_profile_settings.py b/aries_cloudcontroller/models/update_profile_settings.py index 62eb20c4..761ed345 100644 --- a/aries_cloudcontroller/models/update_profile_settings.py +++ b/aries_cloudcontroller/models/update_profile_settings.py @@ -33,7 +33,7 @@ class UpdateProfileSettings(BaseModel): UpdateProfileSettings """ - extra_settings: Optional[Union[str, Any]] = Field( + extra_settings: Optional[Dict[str, Any]] = Field( default=None, description="Agent config key-value pairs" ) __properties: ClassVar[List[str]] = ["extra_settings"] diff --git a/aries_cloudcontroller/models/update_wallet_request.py b/aries_cloudcontroller/models/update_wallet_request.py index 3c1ddad8..9655d623 100644 --- a/aries_cloudcontroller/models/update_wallet_request.py +++ b/aries_cloudcontroller/models/update_wallet_request.py @@ -33,7 +33,7 @@ class UpdateWalletRequest(BaseModel): UpdateWalletRequest """ - extra_settings: Optional[Union[str, Any]] = Field( + extra_settings: Optional[Dict[str, Any]] = Field( default=None, description="Agent config key-value pairs" ) image_url: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/v10_credential_exchange.py b/aries_cloudcontroller/models/v10_credential_exchange.py index ca41c39b..90f6362d 100644 --- a/aries_cloudcontroller/models/v10_credential_exchange.py +++ b/aries_cloudcontroller/models/v10_credential_exchange.py @@ -73,7 +73,7 @@ class V10CredentialExchange(BaseModel): credential_offer_dict: Optional[CredentialOffer] = None credential_proposal_dict: Optional[CredentialProposal] = None credential_request: Optional[IndyCredRequest] = None - credential_request_metadata: Optional[Union[str, Any]] = Field( + credential_request_metadata: Optional[Dict[str, Any]] = Field( default=None, description="(Indy) credential request metadata" ) error_msg: Optional[StrictStr] = Field(default=None, description="Error message") diff --git a/aries_cloudcontroller/models/v20_cred_ex_record_by_format.py b/aries_cloudcontroller/models/v20_cred_ex_record_by_format.py index ead3c78a..5459ebb1 100644 --- a/aries_cloudcontroller/models/v20_cred_ex_record_by_format.py +++ b/aries_cloudcontroller/models/v20_cred_ex_record_by_format.py @@ -33,10 +33,10 @@ class V20CredExRecordByFormat(BaseModel): V20CredExRecordByFormat """ - cred_issue: Optional[Union[str, Any]] = None - cred_offer: Optional[Union[str, Any]] = None - cred_proposal: Optional[Union[str, Any]] = None - cred_request: Optional[Union[str, Any]] = None + cred_issue: Optional[Dict[str, Any]] = None + cred_offer: Optional[Dict[str, Any]] = None + cred_proposal: Optional[Dict[str, Any]] = None + cred_request: Optional[Dict[str, Any]] = None __properties: ClassVar[List[str]] = [ "cred_issue", "cred_offer", diff --git a/aries_cloudcontroller/models/v20_cred_ex_record_indy.py b/aries_cloudcontroller/models/v20_cred_ex_record_indy.py index 4529118a..5ae06e0e 100644 --- a/aries_cloudcontroller/models/v20_cred_ex_record_indy.py +++ b/aries_cloudcontroller/models/v20_cred_ex_record_indy.py @@ -48,7 +48,7 @@ class V20CredExRecordIndy(BaseModel): cred_id_stored: Optional[StrictStr] = Field( default=None, description="Credential identifier stored in wallet" ) - cred_request_metadata: Optional[Union[str, Any]] = Field( + cred_request_metadata: Optional[Dict[str, Any]] = Field( default=None, description="Credential request metadata for indy holder" ) cred_rev_id: Optional[Annotated[str, Field(strict=True)]] = Field( diff --git a/aries_cloudcontroller/models/v20_pres_ex_record_by_format.py b/aries_cloudcontroller/models/v20_pres_ex_record_by_format.py index ddc3f52b..4480f3c5 100644 --- a/aries_cloudcontroller/models/v20_pres_ex_record_by_format.py +++ b/aries_cloudcontroller/models/v20_pres_ex_record_by_format.py @@ -33,9 +33,9 @@ class V20PresExRecordByFormat(BaseModel): V20PresExRecordByFormat """ - pres: Optional[Union[str, Any]] = None - pres_proposal: Optional[Union[str, Any]] = None - pres_request: Optional[Union[str, Any]] = None + pres: Optional[Dict[str, Any]] = None + pres_proposal: Optional[Dict[str, Any]] = None + pres_request: Optional[Dict[str, Any]] = None __properties: ClassVar[List[str]] = ["pres", "pres_proposal", "pres_request"] model_config = DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/vc_record.py b/aries_cloudcontroller/models/vc_record.py index 0c928461..2c9fe58c 100644 --- a/aries_cloudcontroller/models/vc_record.py +++ b/aries_cloudcontroller/models/vc_record.py @@ -36,7 +36,7 @@ class VCRecord(BaseModel): contexts: Optional[List[Annotated[str, Field(strict=True)]]] = None cred_tags: Optional[Dict[str, StrictStr]] = None - cred_value: Optional[Union[str, Any]] = Field( + cred_value: Optional[Dict[str, Any]] = Field( default=None, description="(JSON-serializable) credential value" ) expanded_types: Optional[List[StrictStr]] = None diff --git a/aries_cloudcontroller/models/wallet_record.py b/aries_cloudcontroller/models/wallet_record.py index 917b5e51..efb11e3a 100644 --- a/aries_cloudcontroller/models/wallet_record.py +++ b/aries_cloudcontroller/models/wallet_record.py @@ -41,7 +41,7 @@ class WalletRecord(BaseModel): key_management_mode: StrictStr = Field( description="Mode regarding management of wallet key" ) - settings: Optional[Union[str, Any]] = Field( + settings: Optional[Dict[str, Any]] = Field( default=None, description="Settings for this wallet." ) state: Optional[StrictStr] = Field(default=None, description="Current record state") From 687f985281c5ef9ab5d43baa1273030c5a35c889 Mon Sep 17 00:00:00 2001 From: ff137 Date: Fri, 10 Nov 2023 12:05:49 +0200 Subject: [PATCH 3/9] :art: Replace all `Annotated[str, Field(strict=True)]` with `StrictStr` --- aries_cloudcontroller/api/connection_api.py | 32 +++++++++---------- .../api/credential_definition_api.py | 20 ++++++------ aries_cloudcontroller/api/credentials_api.py | 32 +++++++++---------- aries_cloudcontroller/api/did_exchange_api.py | 28 ++++++++-------- aries_cloudcontroller/api/out_of_band_api.py | 4 +-- .../api/present_proof_v10_api.py | 12 +++---- .../api/present_proof_v20_api.py | 12 +++---- aries_cloudcontroller/api/revocation_api.py | 24 +++++++------- aries_cloudcontroller/api/schema_api.py | 12 +++---- aries_cloudcontroller/api/wallet_api.py | 8 ++--- .../models/attach_decorator.py | 2 +- .../models/attach_decorator_data.py | 4 +-- .../models/attach_decorator_data1_jws.py | 4 +-- .../models/attach_decorator_data_jws.py | 4 +-- .../attach_decorator_data_jws_header.py | 2 +- .../clear_pending_revocations_request.py | 2 +- aries_cloudcontroller/models/conn_record.py | 10 +++--- .../models/connection_invitation.py | 6 ++-- .../models/connection_static_request.py | 6 ++-- .../models/connection_static_result.py | 10 +++--- .../models/create_invitation_request.py | 6 ++-- .../models/create_wallet_response.py | 4 +-- .../models/cred_def_value_primary.py | 8 ++--- aries_cloudcontroller/models/credential.py | 6 ++-- .../models/credential_definition.py | 4 +-- .../credential_definition_send_request.py | 2 +- .../credential_definition_send_result.py | 2 +- .../credential_definitions_created_result.py | 2 +- .../models/credential_proposal.py | 10 +++--- aries_cloudcontroller/models/did.py | 4 +-- .../models/did_create_options.py | 2 +- aries_cloudcontroller/models/did_endpoint.py | 4 +-- .../models/did_endpoint_with_type.py | 4 +-- aries_cloudcontroller/models/didx_request.py | 2 +- aries_cloudcontroller/models/dif_holder.py | 2 +- aries_cloudcontroller/models/dif_options.py | 2 +- .../models/endpoints_result.py | 4 +-- aries_cloudcontroller/models/generated.py | 6 ++-- .../models/get_did_endpoint_response.py | 2 +- .../models/get_did_verkey_response.py | 2 +- .../models/indy_attr_value.py | 2 +- .../models/indy_cred_abstract.py | 6 ++-- .../models/indy_cred_info.py | 8 ++--- .../models/indy_cred_request.py | 6 ++-- .../models/indy_credential.py | 6 ++-- aries_cloudcontroller/models/indy_eq_proof.py | 12 +++---- aries_cloudcontroller/models/indy_ge_proof.py | 10 +++--- .../models/indy_key_correctness_proof.py | 4 +-- .../models/indy_pres_attr_spec.py | 2 +- .../models/indy_pres_pred_spec.py | 2 +- .../models/indy_primary_proof_eq_proof.py | 12 +++---- .../models/indy_proof_identifier.py | 6 ++-- .../models/indy_proof_request.py | 4 +-- ...ndy_proof_requested_proof_revealed_attr.py | 2 +- .../models/indy_rev_reg_def.py | 6 ++-- .../models/indy_rev_reg_def_value.py | 2 +- .../models/indy_rev_reg_entry.py | 2 +- .../models/invitation_create_request.py | 2 +- .../models/invitation_record.py | 4 +-- .../models/issuer_cred_rev_record.py | 10 +++--- .../models/issuer_rev_reg_record.py | 12 +++---- aries_cloudcontroller/models/jws_create.py | 4 +-- aries_cloudcontroller/models/jws_verify.py | 2 +- .../models/keylist_update_rule.py | 2 +- .../models/ld_proof_vc_detail_options.py | 2 +- .../models/linked_data_proof.py | 6 ++-- .../models/mediation_record.py | 6 ++-- aries_cloudcontroller/models/model_schema.py | 6 ++-- aries_cloudcontroller/models/oob_record.py | 4 +-- .../models/presentation_definition.py | 2 +- .../models/publish_revocations.py | 2 +- aries_cloudcontroller/models/raw_encoded.py | 2 +- .../models/receive_invitation_request.py | 6 ++-- .../models/rev_reg_create_request.py | 2 +- .../models/rev_regs_created.py | 2 +- .../models/revoke_request.py | 8 ++--- aries_cloudcontroller/models/route_record.py | 4 +-- .../models/schema_send_request.py | 2 +- .../models/schema_send_result.py | 2 +- .../models/schemas_created_result.py | 2 +- .../models/service_decorator.py | 4 +-- .../models/transaction_record.py | 4 +-- .../v10_credential_conn_free_offer_request.py | 2 +- .../models/v10_credential_create.py | 10 +++--- .../models/v10_credential_exchange.py | 8 ++--- .../v10_credential_free_offer_request.py | 2 +- .../v10_credential_proposal_request_mand.py | 10 +++--- .../v10_credential_proposal_request_opt.py | 10 +++--- .../models/v10_discovery_record.py | 4 +-- .../models/v10_presentation_exchange.py | 4 +-- .../models/v20_cred_ex_record.py | 4 +-- .../models/v20_cred_ex_record_indy.py | 8 ++--- .../models/v20_cred_ex_record_ld_proof.py | 4 +-- .../models/v20_cred_filter_indy.py | 10 +++--- .../models/v20_discovery_record.py | 4 +-- .../models/v20_pres_ex_record.py | 4 +-- aries_cloudcontroller/models/vc_record.py | 2 +- .../models/w3_c_credentials_list_request.py | 6 ++-- aries_cloudcontroller/models/wallet_record.py | 4 +-- generator/scripts/postprocess-client.sh | 3 ++ 100 files changed, 304 insertions(+), 301 deletions(-) diff --git a/aries_cloudcontroller/api/connection_api.py b/aries_cloudcontroller/api/connection_api.py index 44097cc7..05791559 100644 --- a/aries_cloudcontroller/api/connection_api.py +++ b/aries_cloudcontroller/api/connection_api.py @@ -57,11 +57,11 @@ async def accept_invitation( self, conn_id: Annotated[StrictStr, Field(description="Connection identifier")], mediation_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="My URL endpoint"), ] = None, my_label: Annotated[ @@ -107,11 +107,11 @@ async def accept_invitation_with_http_info( self, conn_id: Annotated[StrictStr, Field(description="Connection identifier")], mediation_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="My URL endpoint"), ] = None, my_label: Annotated[ @@ -237,7 +237,7 @@ async def accept_request( self, conn_id: Annotated[StrictStr, Field(description="Connection identifier")], my_endpoint: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="My URL endpoint"), ] = None, **kwargs, @@ -274,7 +274,7 @@ async def accept_request_with_http_info( self, conn_id: Annotated[StrictStr, Field(description="Connection identifier")], my_endpoint: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="My URL endpoint"), ] = None, **kwargs, @@ -1284,7 +1284,7 @@ async def get_connections( Optional[StrictStr], Field(description="Connection protocol used") ] = None, invitation_key: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="invitation key"), ] = None, invitation_msg_id: Annotated[ @@ -1292,16 +1292,16 @@ async def get_connections( Field(description="Identifier of the associated Invitation Mesage"), ] = None, my_did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], Field(description="My DID") + Optional[StrictStr], Field(description="My DID") ] = None, state: Annotated[ Optional[StrictStr], Field(description="Connection state") ] = None, their_did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], Field(description="Their DID") + Optional[StrictStr], Field(description="Their DID") ] = None, their_public_did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Their Public DID"), ] = None, their_role: Annotated[ @@ -1366,7 +1366,7 @@ async def get_connections_with_http_info( Optional[StrictStr], Field(description="Connection protocol used") ] = None, invitation_key: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="invitation key"), ] = None, invitation_msg_id: Annotated[ @@ -1374,16 +1374,16 @@ async def get_connections_with_http_info( Field(description="Identifier of the associated Invitation Mesage"), ] = None, my_did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], Field(description="My DID") + Optional[StrictStr], Field(description="My DID") ] = None, state: Annotated[ Optional[StrictStr], Field(description="Connection state") ] = None, their_did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], Field(description="Their DID") + Optional[StrictStr], Field(description="Their DID") ] = None, their_public_did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Their Public DID"), ] = None, their_role: Annotated[ @@ -1700,7 +1700,7 @@ async def receive_invitation( Field(description="Auto-accept connection (defaults to configuration)"), ] = None, mediation_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Identifier for active mediation record to be used"), ] = None, body: Optional[ReceiveInvitationRequest] = None, @@ -1748,7 +1748,7 @@ async def receive_invitation_with_http_info( Field(description="Auto-accept connection (defaults to configuration)"), ] = None, mediation_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Identifier for active mediation record to be used"), ] = None, body: Optional[ReceiveInvitationRequest] = None, diff --git a/aries_cloudcontroller/api/credential_definition_api.py b/aries_cloudcontroller/api/credential_definition_api.py index 4faadb77..85d89153 100644 --- a/aries_cloudcontroller/api/credential_definition_api.py +++ b/aries_cloudcontroller/api/credential_definition_api.py @@ -189,26 +189,26 @@ async def credential_definitions_cred_def_id_write_record_post_with_http_info( async def get_created_cred_defs( self, cred_def_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Credential definition id"), ] = None, issuer_did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Issuer DID"), ] = None, schema_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Schema identifier"), ] = None, schema_issuer_did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Schema issuer DID"), ] = None, schema_name: Annotated[ Optional[StrictStr], Field(description="Schema name") ] = None, schema_version: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Schema version"), ] = None, **kwargs, @@ -256,26 +256,26 @@ async def get_created_cred_defs( async def get_created_cred_defs_with_http_info( self, cred_def_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Credential definition id"), ] = None, issuer_did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Issuer DID"), ] = None, schema_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Schema identifier"), ] = None, schema_issuer_did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Schema issuer DID"), ] = None, schema_name: Annotated[ Optional[StrictStr], Field(description="Schema name") ] = None, schema_version: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Schema version"), ] = None, **kwargs, diff --git a/aries_cloudcontroller/api/credentials_api.py b/aries_cloudcontroller/api/credentials_api.py index 57e86684..ddcecf6b 100644 --- a/aries_cloudcontroller/api/credentials_api.py +++ b/aries_cloudcontroller/api/credentials_api.py @@ -585,15 +585,15 @@ async def get_record_with_http_info( async def get_records( self, count: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Maximum number to retrieve"), ] = None, start: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Start index"), ] = None, wql: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="(JSON) WQL query"), ] = None, **kwargs, @@ -632,15 +632,15 @@ async def get_records( async def get_records_with_http_info( self, count: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Maximum number to retrieve"), ] = None, start: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Start index"), ] = None, wql: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="(JSON) WQL query"), ] = None, **kwargs, @@ -759,13 +759,13 @@ async def get_revocation_status( self, credential_id: Annotated[StrictStr, Field(description="Credential identifier")], var_from: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field( description="Earliest epoch of revocation status interval of interest" ), ] = None, to: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Latest epoch of revocation status interval of interest"), ] = None, **kwargs, @@ -805,13 +805,13 @@ async def get_revocation_status_with_http_info( self, credential_id: Annotated[StrictStr, Field(description="Credential identifier")], var_from: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field( description="Earliest epoch of revocation status interval of interest" ), ] = None, to: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Latest epoch of revocation status interval of interest"), ] = None, **kwargs, @@ -1062,15 +1062,15 @@ async def get_w3c_credential_with_http_info( async def get_w3c_credentials( self, count: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Maximum number to retrieve"), ] = None, start: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Start index"), ] = None, wql: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="(JSON) WQL query"), ] = None, body: Optional[W3CCredentialsListRequest] = None, @@ -1113,15 +1113,15 @@ async def get_w3c_credentials( async def get_w3c_credentials_with_http_info( self, count: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Maximum number to retrieve"), ] = None, start: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Start index"), ] = None, wql: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="(JSON) WQL query"), ] = None, body: Optional[W3CCredentialsListRequest] = None, diff --git a/aries_cloudcontroller/api/did_exchange_api.py b/aries_cloudcontroller/api/did_exchange_api.py index d2103582..a5a709b9 100644 --- a/aries_cloudcontroller/api/did_exchange_api.py +++ b/aries_cloudcontroller/api/did_exchange_api.py @@ -41,7 +41,7 @@ async def accept_invitation( self, conn_id: Annotated[StrictStr, Field(description="Connection identifier")], my_endpoint: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="My URL endpoint"), ] = None, my_label: Annotated[ @@ -84,7 +84,7 @@ async def accept_invitation_with_http_info( self, conn_id: Annotated[StrictStr, Field(description="Connection identifier")], my_endpoint: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="My URL endpoint"), ] = None, my_label: Annotated[ @@ -205,11 +205,11 @@ async def accept_request( self, conn_id: Annotated[StrictStr, Field(description="Connection identifier")], mediation_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="My URL endpoint"), ] = None, **kwargs, @@ -249,11 +249,11 @@ async def accept_request_with_http_info( self, conn_id: Annotated[StrictStr, Field(description="Connection identifier")], mediation_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="My URL endpoint"), ] = None, **kwargs, @@ -392,11 +392,11 @@ async def create_request( ), ] = None, mediation_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="My URL endpoint"), ] = None, my_label: Annotated[ @@ -479,11 +479,11 @@ async def create_request_with_http_info( ), ] = None, mediation_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="My URL endpoint"), ] = None, my_label: Annotated[ @@ -649,11 +649,11 @@ async def receive_request( Field(description="Auto-accept connection (defaults to configuration)"), ] = None, mediation_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="My URL endpoint"), ] = None, body: Optional[DIDXRequest] = None, @@ -706,11 +706,11 @@ async def receive_request_with_http_info( Field(description="Auto-accept connection (defaults to configuration)"), ] = None, mediation_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="My URL endpoint"), ] = None, body: Optional[DIDXRequest] = None, diff --git a/aries_cloudcontroller/api/out_of_band_api.py b/aries_cloudcontroller/api/out_of_band_api.py index a6350614..7c519b02 100644 --- a/aries_cloudcontroller/api/out_of_band_api.py +++ b/aries_cloudcontroller/api/out_of_band_api.py @@ -226,7 +226,7 @@ async def receive_invitation( Field(description="Auto-accept connection (defaults to configuration)"), ] = None, mediation_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Identifier for active mediation record to be used"), ] = None, use_existing_connection: Annotated[ @@ -283,7 +283,7 @@ async def receive_invitation_with_http_info( Field(description="Auto-accept connection (defaults to configuration)"), ] = None, mediation_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Identifier for active mediation record to be used"), ] = None, use_existing_connection: Annotated[ diff --git a/aries_cloudcontroller/api/present_proof_v10_api.py b/aries_cloudcontroller/api/present_proof_v10_api.py index 04b1df29..f22ea236 100644 --- a/aries_cloudcontroller/api/present_proof_v10_api.py +++ b/aries_cloudcontroller/api/present_proof_v10_api.py @@ -345,11 +345,11 @@ async def get_matching_credentials( str, Field(strict=True, description="Presentation exchange identifier") ], count: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Maximum number to retrieve"), ] = None, extra_query: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="(JSON) object mapping referents to extra WQL queries"), ] = None, referent: Annotated[ @@ -357,7 +357,7 @@ async def get_matching_credentials( Field(description="Proof request referents of interest, comma-separated"), ] = None, start: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Start index"), ] = None, **kwargs, @@ -405,11 +405,11 @@ async def get_matching_credentials_with_http_info( str, Field(strict=True, description="Presentation exchange identifier") ], count: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Maximum number to retrieve"), ] = None, extra_query: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="(JSON) object mapping referents to extra WQL queries"), ] = None, referent: Annotated[ @@ -417,7 +417,7 @@ async def get_matching_credentials_with_http_info( Field(description="Proof request referents of interest, comma-separated"), ] = None, start: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Start index"), ] = None, **kwargs, diff --git a/aries_cloudcontroller/api/present_proof_v20_api.py b/aries_cloudcontroller/api/present_proof_v20_api.py index e2322930..4cc3a5d7 100644 --- a/aries_cloudcontroller/api/present_proof_v20_api.py +++ b/aries_cloudcontroller/api/present_proof_v20_api.py @@ -343,11 +343,11 @@ async def get_matching_credentials( str, Field(strict=True, description="Presentation exchange identifier") ], count: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Maximum number to retrieve"), ] = None, extra_query: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="(JSON) object mapping referents to extra WQL queries"), ] = None, referent: Annotated[ @@ -355,7 +355,7 @@ async def get_matching_credentials( Field(description="Proof request referents of interest, comma-separated"), ] = None, start: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Start index"), ] = None, **kwargs, @@ -403,11 +403,11 @@ async def get_matching_credentials_with_http_info( str, Field(strict=True, description="Presentation exchange identifier") ], count: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Maximum number to retrieve"), ] = None, extra_query: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="(JSON) object mapping referents to extra WQL queries"), ] = None, referent: Annotated[ @@ -415,7 +415,7 @@ async def get_matching_credentials_with_http_info( Field(description="Proof request referents of interest, comma-separated"), ] = None, start: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Start index"), ] = None, **kwargs, diff --git a/aries_cloudcontroller/api/revocation_api.py b/aries_cloudcontroller/api/revocation_api.py index 0cd3f0db..724634e8 100644 --- a/aries_cloudcontroller/api/revocation_api.py +++ b/aries_cloudcontroller/api/revocation_api.py @@ -627,7 +627,7 @@ async def get_active_registry_for_cred_def_with_http_info( async def get_created_registries( self, cred_def_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Credential definition identifier"), ] = None, state: Annotated[ @@ -666,7 +666,7 @@ async def get_created_registries( async def get_created_registries_with_http_info( self, cred_def_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Credential definition identifier"), ] = None, state: Annotated[ @@ -1058,15 +1058,15 @@ async def get_registry_issued_credentials_count_with_http_info( async def get_revocation_status( self, cred_ex_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Credential exchange identifier"), ] = None, cred_rev_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Credential revocation identifier"), ] = None, rev_reg_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Revocation registry identifier"), ] = None, **kwargs, @@ -1105,15 +1105,15 @@ async def get_revocation_status( async def get_revocation_status_with_http_info( self, cred_ex_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Credential exchange identifier"), ] = None, cred_rev_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Credential revocation identifier"), ] = None, rev_reg_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Revocation registry identifier"), ] = None, **kwargs, @@ -1859,11 +1859,11 @@ async def revocation_active_registry_cred_def_id_rotate_post_with_http_info( async def revocation_registry_delete_tails_file_delete( self, cred_def_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Credential definition identifier"), ] = None, rev_reg_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Revocation registry identifier"), ] = None, **kwargs, @@ -1899,11 +1899,11 @@ async def revocation_registry_delete_tails_file_delete( async def revocation_registry_delete_tails_file_delete_with_http_info( self, cred_def_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Credential definition identifier"), ] = None, rev_reg_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Revocation registry identifier"), ] = None, **kwargs, diff --git a/aries_cloudcontroller/api/schema_api.py b/aries_cloudcontroller/api/schema_api.py index af3318b6..d61665aa 100644 --- a/aries_cloudcontroller/api/schema_api.py +++ b/aries_cloudcontroller/api/schema_api.py @@ -42,18 +42,18 @@ def __init__(self, api_client=None) -> None: async def get_created_schemas( self, schema_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Schema identifier"), ] = None, schema_issuer_did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Schema issuer DID"), ] = None, schema_name: Annotated[ Optional[StrictStr], Field(description="Schema name") ] = None, schema_version: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Schema version"), ] = None, **kwargs, @@ -95,18 +95,18 @@ async def get_created_schemas( async def get_created_schemas_with_http_info( self, schema_id: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Schema identifier"), ] = None, schema_issuer_did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Schema issuer DID"), ] = None, schema_name: Annotated[ Optional[StrictStr], Field(description="Schema name") ] = None, schema_version: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Schema version"), ] = None, **kwargs, diff --git a/aries_cloudcontroller/api/wallet_api.py b/aries_cloudcontroller/api/wallet_api.py index d768d071..0d1ec02c 100644 --- a/aries_cloudcontroller/api/wallet_api.py +++ b/aries_cloudcontroller/api/wallet_api.py @@ -324,7 +324,7 @@ async def get_did_endpoint_with_http_info( async def get_dids( self, did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="DID of interest"), ] = None, key_type: Annotated[ @@ -343,7 +343,7 @@ async def get_dids( ), ] = None, verkey: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Verification key of interest"), ] = None, **kwargs, @@ -388,7 +388,7 @@ async def get_dids( async def get_dids_with_http_info( self, did: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="DID of interest"), ] = None, key_type: Annotated[ @@ -407,7 +407,7 @@ async def get_dids_with_http_info( ), ] = None, verkey: Annotated[ - Optional[Annotated[str, Field(strict=True)]], + Optional[StrictStr], Field(description="Verification key of interest"), ] = None, **kwargs, diff --git a/aries_cloudcontroller/models/attach_decorator.py b/aries_cloudcontroller/models/attach_decorator.py index 8ddd8377..f86dee29 100644 --- a/aries_cloudcontroller/models/attach_decorator.py +++ b/aries_cloudcontroller/models/attach_decorator.py @@ -47,7 +47,7 @@ class AttachDecorator(BaseModel): default=None, description="Human-readable description of content" ) filename: Optional[StrictStr] = Field(default=None, description="File name") - lastmod_time: Optional[Annotated[str, Field(strict=True)]] = Field( + lastmod_time: Optional[StrictStr] = Field( default=None, description="Hint regarding last modification datetime, in ISO-8601 format", ) diff --git a/aries_cloudcontroller/models/attach_decorator_data.py b/aries_cloudcontroller/models/attach_decorator_data.py index 398a85aa..38dd211c 100644 --- a/aries_cloudcontroller/models/attach_decorator_data.py +++ b/aries_cloudcontroller/models/attach_decorator_data.py @@ -38,7 +38,7 @@ class AttachDecoratorData(BaseModel): AttachDecoratorData """ - var_base64: Optional[Annotated[str, Field(strict=True)]] = Field( + var_base64: Optional[StrictStr] = Field( default=None, description="Base64-encoded data", alias="base64" ) var_json: Optional[Union[Dict[str, Any], List[Dict[str, Any]]]] = Field( @@ -48,7 +48,7 @@ class AttachDecoratorData(BaseModel): links: Optional[List[StrictStr]] = Field( default=None, description="List of hypertext links to data" ) - sha256: Optional[Annotated[str, Field(strict=True)]] = Field( + sha256: Optional[StrictStr] = Field( default=None, description="SHA256 hash (binhex encoded) of content" ) __properties: ClassVar[List[str]] = ["base64", "json", "jws", "links", "sha256"] diff --git a/aries_cloudcontroller/models/attach_decorator_data1_jws.py b/aries_cloudcontroller/models/attach_decorator_data1_jws.py index 5f0df2e7..dbe5954f 100644 --- a/aries_cloudcontroller/models/attach_decorator_data1_jws.py +++ b/aries_cloudcontroller/models/attach_decorator_data1_jws.py @@ -39,10 +39,10 @@ class AttachDecoratorData1JWS(BaseModel): """ header: AttachDecoratorDataJWSHeader - protected: Optional[Annotated[str, Field(strict=True)]] = Field( + protected: Optional[StrictStr] = Field( default=None, description="protected JWS header" ) - signature: Annotated[str, Field(strict=True)] = Field(description="signature") + signature: StrictStr = Field(description="signature") __properties: ClassVar[List[str]] = ["header", "protected", "signature"] @field_validator("protected") diff --git a/aries_cloudcontroller/models/attach_decorator_data_jws.py b/aries_cloudcontroller/models/attach_decorator_data_jws.py index 3bcad974..056dd5fa 100644 --- a/aries_cloudcontroller/models/attach_decorator_data_jws.py +++ b/aries_cloudcontroller/models/attach_decorator_data_jws.py @@ -42,10 +42,10 @@ class AttachDecoratorDataJWS(BaseModel): """ header: Optional[AttachDecoratorDataJWSHeader] = None - protected: Optional[Annotated[str, Field(strict=True)]] = Field( + protected: Optional[StrictStr] = Field( default=None, description="protected JWS header" ) - signature: Optional[Annotated[str, Field(strict=True)]] = Field( + signature: Optional[StrictStr] = Field( default=None, description="signature" ) signatures: Optional[List[AttachDecoratorData1JWS]] = Field( diff --git a/aries_cloudcontroller/models/attach_decorator_data_jws_header.py b/aries_cloudcontroller/models/attach_decorator_data_jws_header.py index 249179e8..7a056dee 100644 --- a/aries_cloudcontroller/models/attach_decorator_data_jws_header.py +++ b/aries_cloudcontroller/models/attach_decorator_data_jws_header.py @@ -35,7 +35,7 @@ class AttachDecoratorDataJWSHeader(BaseModel): AttachDecoratorDataJWSHeader """ - kid: Annotated[str, Field(strict=True)] = Field( + kid: StrictStr = Field( description="Key identifier, in W3C did:key or DID URL format" ) __properties: ClassVar[List[str]] = ["kid"] diff --git a/aries_cloudcontroller/models/clear_pending_revocations_request.py b/aries_cloudcontroller/models/clear_pending_revocations_request.py index c2dbde1b..c2a38cb9 100644 --- a/aries_cloudcontroller/models/clear_pending_revocations_request.py +++ b/aries_cloudcontroller/models/clear_pending_revocations_request.py @@ -34,7 +34,7 @@ class ClearPendingRevocationsRequest(BaseModel): ClearPendingRevocationsRequest """ - purge: Optional[Dict[str, List[Annotated[str, Field(strict=True)]]]] = Field( + purge: Optional[Dict[str, List[StrictStr]]] = Field( default=None, description="Credential revocation ids by revocation registry id: omit for all, specify null or empty list for all pending per revocation registry", ) diff --git a/aries_cloudcontroller/models/conn_record.py b/aries_cloudcontroller/models/conn_record.py index 9096ccc6..7e83f34e 100644 --- a/aries_cloudcontroller/models/conn_record.py +++ b/aries_cloudcontroller/models/conn_record.py @@ -47,14 +47,14 @@ class ConnRecord(BaseModel): connection_protocol: Optional[StrictStr] = Field( default=None, description="Connection protocol used" ) - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) error_msg: Optional[StrictStr] = Field(default=None, description="Error message") inbound_connection_id: Optional[StrictStr] = Field( default=None, description="Inbound routing connection id to use" ) - invitation_key: Optional[Annotated[str, Field(strict=True)]] = Field( + invitation_key: Optional[StrictStr] = Field( default=None, description="Public key for connection" ) invitation_mode: Optional[StrictStr] = Field( @@ -63,7 +63,7 @@ class ConnRecord(BaseModel): invitation_msg_id: Optional[StrictStr] = Field( default=None, description="ID of out-of-band invitation message" ) - my_did: Optional[Annotated[str, Field(strict=True)]] = Field( + my_did: Optional[StrictStr] = Field( default=None, description="Our DID for connection" ) request_id: Optional[StrictStr] = Field( @@ -76,7 +76,7 @@ class ConnRecord(BaseModel): default=None, description="Routing state of connection" ) state: Optional[StrictStr] = Field(default=None, description="Current record state") - their_did: Optional[Annotated[str, Field(strict=True)]] = Field( + their_did: Optional[StrictStr] = Field( default=None, description="Their DID for connection" ) their_label: Optional[StrictStr] = Field( @@ -88,7 +88,7 @@ class ConnRecord(BaseModel): their_role: Optional[StrictStr] = Field( default=None, description="Their role in the connection protocol" ) - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/connection_invitation.py b/aries_cloudcontroller/models/connection_invitation.py index e9a33c6d..19957b61 100644 --- a/aries_cloudcontroller/models/connection_invitation.py +++ b/aries_cloudcontroller/models/connection_invitation.py @@ -41,7 +41,7 @@ class ConnectionInvitation(BaseModel): type: Optional[StrictStr] = Field( default=None, description="Message type", alias="@type" ) - did: Optional[Annotated[str, Field(strict=True)]] = Field( + did: Optional[StrictStr] = Field( default=None, description="DID for connection invitation" ) image_url: Optional[StrictStr] = Field( @@ -52,10 +52,10 @@ class ConnectionInvitation(BaseModel): label: Optional[StrictStr] = Field( default=None, description="Optional label for connection invitation" ) - recipient_keys: Optional[List[Annotated[str, Field(strict=True)]]] = Field( + recipient_keys: Optional[List[StrictStr]] = Field( default=None, description="List of recipient keys", alias="recipientKeys" ) - routing_keys: Optional[List[Annotated[str, Field(strict=True)]]] = Field( + routing_keys: Optional[List[StrictStr]] = Field( default=None, description="List of routing keys", alias="routingKeys" ) service_endpoint: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/connection_static_request.py b/aries_cloudcontroller/models/connection_static_request.py index cb5a6180..abda9069 100644 --- a/aries_cloudcontroller/models/connection_static_request.py +++ b/aries_cloudcontroller/models/connection_static_request.py @@ -38,16 +38,16 @@ class ConnectionStaticRequest(BaseModel): alias: Optional[StrictStr] = Field( default=None, description="Alias to assign to this connection" ) - my_did: Optional[Annotated[str, Field(strict=True)]] = Field( + my_did: Optional[StrictStr] = Field( default=None, description="Local DID" ) my_seed: Optional[StrictStr] = Field( default=None, description="Seed to use for the local DID" ) - their_did: Optional[Annotated[str, Field(strict=True)]] = Field( + their_did: Optional[StrictStr] = Field( default=None, description="Remote DID" ) - their_endpoint: Optional[Annotated[str, Field(strict=True)]] = Field( + their_endpoint: Optional[StrictStr] = Field( default=None, description="URL endpoint for other party" ) their_label: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/connection_static_result.py b/aries_cloudcontroller/models/connection_static_result.py index 290359a7..123313ec 100644 --- a/aries_cloudcontroller/models/connection_static_result.py +++ b/aries_cloudcontroller/models/connection_static_result.py @@ -36,16 +36,16 @@ class ConnectionStaticResult(BaseModel): ConnectionStaticResult """ - my_did: Annotated[str, Field(strict=True)] = Field(description="Local DID") - my_endpoint: Annotated[str, Field(strict=True)] = Field( + my_did: StrictStr = Field(description="Local DID") + my_endpoint: StrictStr = Field( description="My URL endpoint" ) - my_verkey: Annotated[str, Field(strict=True)] = Field( + my_verkey: StrictStr = Field( description="My verification key" ) record: ConnRecord - their_did: Annotated[str, Field(strict=True)] = Field(description="Remote DID") - their_verkey: Annotated[str, Field(strict=True)] = Field( + their_did: StrictStr = Field(description="Remote DID") + their_verkey: StrictStr = Field( description="Remote verification key" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/create_invitation_request.py b/aries_cloudcontroller/models/create_invitation_request.py index dfe7956a..18c879c7 100644 --- a/aries_cloudcontroller/models/create_invitation_request.py +++ b/aries_cloudcontroller/models/create_invitation_request.py @@ -35,7 +35,7 @@ class CreateInvitationRequest(BaseModel): CreateInvitationRequest """ - mediation_id: Optional[Annotated[str, Field(strict=True)]] = Field( + mediation_id: Optional[StrictStr] = Field( default=None, description="Identifier for active mediation record to be used" ) metadata: Optional[Dict[str, Any]] = Field( @@ -45,10 +45,10 @@ class CreateInvitationRequest(BaseModel): my_label: Optional[StrictStr] = Field( default=None, description="Optional label for connection invitation" ) - recipient_keys: Optional[List[Annotated[str, Field(strict=True)]]] = Field( + recipient_keys: Optional[List[StrictStr]] = Field( default=None, description="List of recipient keys" ) - routing_keys: Optional[List[Annotated[str, Field(strict=True)]]] = Field( + routing_keys: Optional[List[StrictStr]] = Field( default=None, description="List of routing keys" ) service_endpoint: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/create_wallet_response.py b/aries_cloudcontroller/models/create_wallet_response.py index 8a26ca75..92803acb 100644 --- a/aries_cloudcontroller/models/create_wallet_response.py +++ b/aries_cloudcontroller/models/create_wallet_response.py @@ -35,7 +35,7 @@ class CreateWalletResponse(BaseModel): CreateWalletResponse """ - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) key_management_mode: StrictStr = Field( @@ -48,7 +48,7 @@ class CreateWalletResponse(BaseModel): token: Optional[StrictStr] = Field( default=None, description="Authorization token to authenticate wallet requests" ) - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) wallet_id: StrictStr = Field(description="Wallet record ID") diff --git a/aries_cloudcontroller/models/cred_def_value_primary.py b/aries_cloudcontroller/models/cred_def_value_primary.py index 1899baed..465ab43a 100644 --- a/aries_cloudcontroller/models/cred_def_value_primary.py +++ b/aries_cloudcontroller/models/cred_def_value_primary.py @@ -36,11 +36,11 @@ class CredDefValuePrimary(BaseModel): CredDefValuePrimary """ - n: Optional[Annotated[str, Field(strict=True)]] = None + n: Optional[StrictStr] = None r: Optional[Generated] = None - rctxt: Optional[Annotated[str, Field(strict=True)]] = None - s: Optional[Annotated[str, Field(strict=True)]] = None - z: Optional[Annotated[str, Field(strict=True)]] = None + rctxt: Optional[StrictStr] = None + s: Optional[StrictStr] = None + z: Optional[StrictStr] = None __properties: ClassVar[List[str]] = ["n", "r", "rctxt", "s", "z"] @field_validator("n") diff --git a/aries_cloudcontroller/models/credential.py b/aries_cloudcontroller/models/credential.py index 9157b8c2..cbae4cb5 100644 --- a/aries_cloudcontroller/models/credential.py +++ b/aries_cloudcontroller/models/credential.py @@ -40,11 +40,11 @@ class Credential(BaseModel): description="The JSON-LD context of the credential", alias="@context" ) credential_subject: Dict[str, Any] = Field(alias="credentialSubject") - expiration_date: Optional[Annotated[str, Field(strict=True)]] = Field( + expiration_date: Optional[StrictStr] = Field( default=None, description="The expiration date", alias="expirationDate" ) - id: Optional[Annotated[str, Field(strict=True)]] = None - issuance_date: Annotated[str, Field(strict=True)] = Field( + id: Optional[StrictStr] = None + issuance_date: StrictStr = Field( description="The issuance date", alias="issuanceDate" ) issuer: Union[str, Dict[str, Any]] = Field( diff --git a/aries_cloudcontroller/models/credential_definition.py b/aries_cloudcontroller/models/credential_definition.py index 82dd9623..4684b49f 100644 --- a/aries_cloudcontroller/models/credential_definition.py +++ b/aries_cloudcontroller/models/credential_definition.py @@ -36,7 +36,7 @@ class CredentialDefinition(BaseModel): CredentialDefinition """ - id: Optional[Annotated[str, Field(strict=True)]] = Field( + id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier" ) schema_id: Optional[StrictStr] = Field( @@ -51,7 +51,7 @@ class CredentialDefinition(BaseModel): default=None, description="Signature type: CL for Camenisch-Lysyanskaya" ) value: Optional[CredDefValue] = None - ver: Optional[Annotated[str, Field(strict=True)]] = Field( + ver: Optional[StrictStr] = Field( default=None, description="Node protocol version" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/credential_definition_send_request.py b/aries_cloudcontroller/models/credential_definition_send_request.py index 283437af..4fdbc79e 100644 --- a/aries_cloudcontroller/models/credential_definition_send_request.py +++ b/aries_cloudcontroller/models/credential_definition_send_request.py @@ -38,7 +38,7 @@ class CredentialDefinitionSendRequest(BaseModel): revocation_registry_size: Optional[ Annotated[int, Field(le=32768, strict=True, ge=4)] ] = Field(default=None, description="Revocation registry size") - schema_id: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_id: Optional[StrictStr] = Field( default=None, description="Schema identifier" ) support_revocation: Optional[StrictBool] = Field( diff --git a/aries_cloudcontroller/models/credential_definition_send_result.py b/aries_cloudcontroller/models/credential_definition_send_result.py index 04f5f575..de1a6455 100644 --- a/aries_cloudcontroller/models/credential_definition_send_result.py +++ b/aries_cloudcontroller/models/credential_definition_send_result.py @@ -35,7 +35,7 @@ class CredentialDefinitionSendResult(BaseModel): CredentialDefinitionSendResult """ - credential_definition_id: Optional[Annotated[str, Field(strict=True)]] = Field( + credential_definition_id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier" ) __properties: ClassVar[List[str]] = ["credential_definition_id"] diff --git a/aries_cloudcontroller/models/credential_definitions_created_result.py b/aries_cloudcontroller/models/credential_definitions_created_result.py index c5531177..efafcc1d 100644 --- a/aries_cloudcontroller/models/credential_definitions_created_result.py +++ b/aries_cloudcontroller/models/credential_definitions_created_result.py @@ -34,7 +34,7 @@ class CredentialDefinitionsCreatedResult(BaseModel): CredentialDefinitionsCreatedResult """ - credential_definition_ids: Optional[List[Annotated[str, Field(strict=True)]]] = None + credential_definition_ids: Optional[List[StrictStr]] = None __properties: ClassVar[List[str]] = ["credential_definition_ids"] model_config = DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/credential_proposal.py b/aries_cloudcontroller/models/credential_proposal.py index a09cf8cc..31e202fe 100644 --- a/aries_cloudcontroller/models/credential_proposal.py +++ b/aries_cloudcontroller/models/credential_proposal.py @@ -45,13 +45,13 @@ class CredentialProposal(BaseModel): comment: Optional[StrictStr] = Field( default=None, description="Human-readable comment" ) - cred_def_id: Optional[Annotated[str, Field(strict=True)]] = None + cred_def_id: Optional[StrictStr] = None credential_proposal: Optional[CredentialPreview] = None - issuer_did: Optional[Annotated[str, Field(strict=True)]] = None - schema_id: Optional[Annotated[str, Field(strict=True)]] = None - schema_issuer_did: Optional[Annotated[str, Field(strict=True)]] = None + issuer_did: Optional[StrictStr] = None + schema_id: Optional[StrictStr] = None + schema_issuer_did: Optional[StrictStr] = None schema_name: Optional[StrictStr] = None - schema_version: Optional[Annotated[str, Field(strict=True)]] = None + schema_version: Optional[StrictStr] = None __properties: ClassVar[List[str]] = [ "@id", "@type", diff --git a/aries_cloudcontroller/models/did.py b/aries_cloudcontroller/models/did.py index 28993f6d..9a0be6cb 100644 --- a/aries_cloudcontroller/models/did.py +++ b/aries_cloudcontroller/models/did.py @@ -36,7 +36,7 @@ class DID(BaseModel): DID """ - did: Optional[Annotated[str, Field(strict=True)]] = Field( + did: Optional[StrictStr] = Field( default=None, description="DID of interest" ) key_type: Optional[Literal["ed25519", "bls12381g2"]] = Field( @@ -49,7 +49,7 @@ class DID(BaseModel): default=None, description="Whether DID is current public DID, posted to ledger but not current public DID, or local to the wallet", ) - verkey: Optional[Annotated[str, Field(strict=True)]] = Field( + verkey: Optional[StrictStr] = Field( default=None, description="Public verification key" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/did_create_options.py b/aries_cloudcontroller/models/did_create_options.py index bb05b036..afa36da6 100644 --- a/aries_cloudcontroller/models/did_create_options.py +++ b/aries_cloudcontroller/models/did_create_options.py @@ -35,7 +35,7 @@ class DIDCreateOptions(BaseModel): DIDCreateOptions """ - did: Optional[Annotated[str, Field(strict=True)]] = Field( + did: Optional[StrictStr] = Field( default=None, description="Specify final value of the did (including did:: prefix)if the method supports or requires so.", ) diff --git a/aries_cloudcontroller/models/did_endpoint.py b/aries_cloudcontroller/models/did_endpoint.py index cdc57bdd..1c9093d1 100644 --- a/aries_cloudcontroller/models/did_endpoint.py +++ b/aries_cloudcontroller/models/did_endpoint.py @@ -35,8 +35,8 @@ class DIDEndpoint(BaseModel): DIDEndpoint """ - did: Annotated[str, Field(strict=True)] = Field(description="DID of interest") - endpoint: Optional[Annotated[str, Field(strict=True)]] = Field( + did: StrictStr = Field(description="DID of interest") + endpoint: Optional[StrictStr] = Field( default=None, description="Endpoint to set (omit to delete)" ) __properties: ClassVar[List[str]] = ["did", "endpoint"] diff --git a/aries_cloudcontroller/models/did_endpoint_with_type.py b/aries_cloudcontroller/models/did_endpoint_with_type.py index 954c368d..ad2f5ba3 100644 --- a/aries_cloudcontroller/models/did_endpoint_with_type.py +++ b/aries_cloudcontroller/models/did_endpoint_with_type.py @@ -35,8 +35,8 @@ class DIDEndpointWithType(BaseModel): DIDEndpointWithType """ - did: Annotated[str, Field(strict=True)] = Field(description="DID of interest") - endpoint: Optional[Annotated[str, Field(strict=True)]] = Field( + did: StrictStr = Field(description="DID of interest") + endpoint: Optional[StrictStr] = Field( default=None, description="Endpoint to set (omit to delete)" ) endpoint_type: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/didx_request.py b/aries_cloudcontroller/models/didx_request.py index 33240025..56824592 100644 --- a/aries_cloudcontroller/models/didx_request.py +++ b/aries_cloudcontroller/models/didx_request.py @@ -42,7 +42,7 @@ class DIDXRequest(BaseModel): type: Optional[StrictStr] = Field( default=None, description="Message type", alias="@type" ) - did: Optional[Annotated[str, Field(strict=True)]] = Field( + did: Optional[StrictStr] = Field( default=None, description="DID of exchange" ) did_docattach: Optional[AttachDecorator] = Field( diff --git a/aries_cloudcontroller/models/dif_holder.py b/aries_cloudcontroller/models/dif_holder.py index c9238549..f2a4eaec 100644 --- a/aries_cloudcontroller/models/dif_holder.py +++ b/aries_cloudcontroller/models/dif_holder.py @@ -35,7 +35,7 @@ class DIFHolder(BaseModel): """ directive: Optional[StrictStr] = Field(default=None, description="Preference") - field_id: Optional[List[Annotated[str, Field(strict=True)]]] = None + field_id: Optional[List[StrictStr]] = None __properties: ClassVar[List[str]] = ["directive", "field_id"] @field_validator("directive") diff --git a/aries_cloudcontroller/models/dif_options.py b/aries_cloudcontroller/models/dif_options.py index 25672976..e80aeb75 100644 --- a/aries_cloudcontroller/models/dif_options.py +++ b/aries_cloudcontroller/models/dif_options.py @@ -35,7 +35,7 @@ class DIFOptions(BaseModel): DIFOptions """ - challenge: Optional[Annotated[str, Field(strict=True)]] = Field( + challenge: Optional[StrictStr] = Field( default=None, description="Challenge protect against replay attack" ) domain: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/endpoints_result.py b/aries_cloudcontroller/models/endpoints_result.py index 3bb7c8a2..d2714f1c 100644 --- a/aries_cloudcontroller/models/endpoints_result.py +++ b/aries_cloudcontroller/models/endpoints_result.py @@ -35,10 +35,10 @@ class EndpointsResult(BaseModel): EndpointsResult """ - my_endpoint: Optional[Annotated[str, Field(strict=True)]] = Field( + my_endpoint: Optional[StrictStr] = Field( default=None, description="My endpoint" ) - their_endpoint: Optional[Annotated[str, Field(strict=True)]] = Field( + their_endpoint: Optional[StrictStr] = Field( default=None, description="Their endpoint" ) __properties: ClassVar[List[str]] = ["my_endpoint", "their_endpoint"] diff --git a/aries_cloudcontroller/models/generated.py b/aries_cloudcontroller/models/generated.py index 454c1b1b..bd3647a4 100644 --- a/aries_cloudcontroller/models/generated.py +++ b/aries_cloudcontroller/models/generated.py @@ -35,9 +35,9 @@ class Generated(BaseModel): Generated """ - master_secret: Optional[Annotated[str, Field(strict=True)]] = None - number: Optional[Annotated[str, Field(strict=True)]] = None - remainder: Optional[Annotated[str, Field(strict=True)]] = None + master_secret: Optional[StrictStr] = None + number: Optional[StrictStr] = None + remainder: Optional[StrictStr] = None __properties: ClassVar[List[str]] = ["master_secret", "number", "remainder"] @field_validator("master_secret") diff --git a/aries_cloudcontroller/models/get_did_endpoint_response.py b/aries_cloudcontroller/models/get_did_endpoint_response.py index bd311287..2dc6f086 100644 --- a/aries_cloudcontroller/models/get_did_endpoint_response.py +++ b/aries_cloudcontroller/models/get_did_endpoint_response.py @@ -35,7 +35,7 @@ class GetDIDEndpointResponse(BaseModel): GetDIDEndpointResponse """ - endpoint: Optional[Annotated[str, Field(strict=True)]] = Field( + endpoint: Optional[StrictStr] = Field( default=None, description="Full verification key" ) __properties: ClassVar[List[str]] = ["endpoint"] diff --git a/aries_cloudcontroller/models/get_did_verkey_response.py b/aries_cloudcontroller/models/get_did_verkey_response.py index 9bf06857..6e84f94d 100644 --- a/aries_cloudcontroller/models/get_did_verkey_response.py +++ b/aries_cloudcontroller/models/get_did_verkey_response.py @@ -35,7 +35,7 @@ class GetDIDVerkeyResponse(BaseModel): GetDIDVerkeyResponse """ - verkey: Optional[Annotated[str, Field(strict=True)]] = Field( + verkey: Optional[StrictStr] = Field( default=None, description="Full verification key" ) __properties: ClassVar[List[str]] = ["verkey"] diff --git a/aries_cloudcontroller/models/indy_attr_value.py b/aries_cloudcontroller/models/indy_attr_value.py index e71ddb02..fd25fb01 100644 --- a/aries_cloudcontroller/models/indy_attr_value.py +++ b/aries_cloudcontroller/models/indy_attr_value.py @@ -35,7 +35,7 @@ class IndyAttrValue(BaseModel): IndyAttrValue """ - encoded: Annotated[str, Field(strict=True)] = Field( + encoded: StrictStr = Field( description="Attribute encoded value" ) raw: StrictStr = Field(description="Attribute raw value") diff --git a/aries_cloudcontroller/models/indy_cred_abstract.py b/aries_cloudcontroller/models/indy_cred_abstract.py index fd33cb49..c67eea54 100644 --- a/aries_cloudcontroller/models/indy_cred_abstract.py +++ b/aries_cloudcontroller/models/indy_cred_abstract.py @@ -38,14 +38,14 @@ class IndyCredAbstract(BaseModel): IndyCredAbstract """ - cred_def_id: Annotated[str, Field(strict=True)] = Field( + cred_def_id: StrictStr = Field( description="Credential definition identifier" ) key_correctness_proof: IndyKeyCorrectnessProof - nonce: Annotated[str, Field(strict=True)] = Field( + nonce: StrictStr = Field( description="Nonce in credential abstract" ) - schema_id: Annotated[str, Field(strict=True)] = Field( + schema_id: StrictStr = Field( description="Schema identifier" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/indy_cred_info.py b/aries_cloudcontroller/models/indy_cred_info.py index 539120b5..170a08e3 100644 --- a/aries_cloudcontroller/models/indy_cred_info.py +++ b/aries_cloudcontroller/models/indy_cred_info.py @@ -38,17 +38,17 @@ class IndyCredInfo(BaseModel): attrs: Optional[Dict[str, StrictStr]] = Field( default=None, description="Attribute names and value" ) - cred_def_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_def_id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier" ) - cred_rev_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_rev_id: Optional[StrictStr] = Field( default=None, description="Credential revocation identifier" ) referent: Optional[StrictStr] = Field(default=None, description="Wallet referent") - rev_reg_id: Optional[Annotated[str, Field(strict=True)]] = Field( + rev_reg_id: Optional[StrictStr] = Field( default=None, description="Revocation registry identifier" ) - schema_id: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_id: Optional[StrictStr] = Field( default=None, description="Schema identifier" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/indy_cred_request.py b/aries_cloudcontroller/models/indy_cred_request.py index 1b05004a..30f2774d 100644 --- a/aries_cloudcontroller/models/indy_cred_request.py +++ b/aries_cloudcontroller/models/indy_cred_request.py @@ -39,13 +39,13 @@ class IndyCredRequest(BaseModel): blinded_ms_correctness_proof: Dict[str, Any] = Field( description="Blinded master secret correctness proof" ) - cred_def_id: Annotated[str, Field(strict=True)] = Field( + cred_def_id: StrictStr = Field( description="Credential definition identifier" ) - nonce: Annotated[str, Field(strict=True)] = Field( + nonce: StrictStr = Field( description="Nonce in credential request" ) - prover_did: Annotated[str, Field(strict=True)] = Field(description="Prover DID") + prover_did: StrictStr = Field(description="Prover DID") __properties: ClassVar[List[str]] = [ "blinded_ms", "blinded_ms_correctness_proof", diff --git a/aries_cloudcontroller/models/indy_credential.py b/aries_cloudcontroller/models/indy_credential.py index f3b517ed..618ea314 100644 --- a/aries_cloudcontroller/models/indy_credential.py +++ b/aries_cloudcontroller/models/indy_credential.py @@ -36,16 +36,16 @@ class IndyCredential(BaseModel): IndyCredential """ - cred_def_id: Annotated[str, Field(strict=True)] = Field( + cred_def_id: StrictStr = Field( description="Credential definition identifier" ) rev_reg: Optional[Dict[str, Any]] = Field( default=None, description="Revocation registry state" ) - rev_reg_id: Optional[Annotated[str, Field(strict=True)]] = Field( + rev_reg_id: Optional[StrictStr] = Field( default=None, description="Revocation registry identifier" ) - schema_id: Annotated[str, Field(strict=True)] = Field( + schema_id: StrictStr = Field( description="Schema identifier" ) signature: Dict[str, Any] = Field(description="Credential signature") diff --git a/aries_cloudcontroller/models/indy_eq_proof.py b/aries_cloudcontroller/models/indy_eq_proof.py index 3ba53384..0d2d0903 100644 --- a/aries_cloudcontroller/models/indy_eq_proof.py +++ b/aries_cloudcontroller/models/indy_eq_proof.py @@ -35,12 +35,12 @@ class IndyEQProof(BaseModel): IndyEQProof """ - a_prime: Optional[Annotated[str, Field(strict=True)]] = None - e: Optional[Annotated[str, Field(strict=True)]] = None - m: Optional[Dict[str, Annotated[str, Field(strict=True)]]] = None - m2: Optional[Annotated[str, Field(strict=True)]] = None - revealed_attrs: Optional[Dict[str, Annotated[str, Field(strict=True)]]] = None - v: Optional[Annotated[str, Field(strict=True)]] = None + a_prime: Optional[StrictStr] = None + e: Optional[StrictStr] = None + m: Optional[Dict[str, StrictStr]] = None + m2: Optional[StrictStr] = None + revealed_attrs: Optional[Dict[str, StrictStr]] = None + v: Optional[StrictStr] = None __properties: ClassVar[List[str]] = [ "a_prime", "e", diff --git a/aries_cloudcontroller/models/indy_ge_proof.py b/aries_cloudcontroller/models/indy_ge_proof.py index ffd721f3..31d96efc 100644 --- a/aries_cloudcontroller/models/indy_ge_proof.py +++ b/aries_cloudcontroller/models/indy_ge_proof.py @@ -36,12 +36,12 @@ class IndyGEProof(BaseModel): IndyGEProof """ - alpha: Optional[Annotated[str, Field(strict=True)]] = None - mj: Optional[Annotated[str, Field(strict=True)]] = None + alpha: Optional[StrictStr] = None + mj: Optional[StrictStr] = None predicate: Optional[IndyGEProofPred] = None - r: Optional[Dict[str, Annotated[str, Field(strict=True)]]] = None - t: Optional[Dict[str, Annotated[str, Field(strict=True)]]] = None - u: Optional[Dict[str, Annotated[str, Field(strict=True)]]] = None + r: Optional[Dict[str, StrictStr]] = None + t: Optional[Dict[str, StrictStr]] = None + u: Optional[Dict[str, StrictStr]] = None __properties: ClassVar[List[str]] = ["alpha", "mj", "predicate", "r", "t", "u"] @field_validator("alpha") diff --git a/aries_cloudcontroller/models/indy_key_correctness_proof.py b/aries_cloudcontroller/models/indy_key_correctness_proof.py index 280289ae..26f53b91 100644 --- a/aries_cloudcontroller/models/indy_key_correctness_proof.py +++ b/aries_cloudcontroller/models/indy_key_correctness_proof.py @@ -35,11 +35,11 @@ class IndyKeyCorrectnessProof(BaseModel): IndyKeyCorrectnessProof """ - c: Annotated[str, Field(strict=True)] = Field( + c: StrictStr = Field( description="c in key correctness proof" ) xr_cap: List[List[StrictStr]] = Field(description="xr_cap in key correctness proof") - xz_cap: Annotated[str, Field(strict=True)] = Field( + xz_cap: StrictStr = Field( description="xz_cap in key correctness proof" ) __properties: ClassVar[List[str]] = ["c", "xr_cap", "xz_cap"] diff --git a/aries_cloudcontroller/models/indy_pres_attr_spec.py b/aries_cloudcontroller/models/indy_pres_attr_spec.py index e1bbb2a5..305b16b5 100644 --- a/aries_cloudcontroller/models/indy_pres_attr_spec.py +++ b/aries_cloudcontroller/models/indy_pres_attr_spec.py @@ -35,7 +35,7 @@ class IndyPresAttrSpec(BaseModel): IndyPresAttrSpec """ - cred_def_id: Optional[Annotated[str, Field(strict=True)]] = None + cred_def_id: Optional[StrictStr] = None mime_type: Optional[StrictStr] = Field( default=None, description="MIME type (default null)", alias="mime-type" ) diff --git a/aries_cloudcontroller/models/indy_pres_pred_spec.py b/aries_cloudcontroller/models/indy_pres_pred_spec.py index 8d2b8c8c..f2f76567 100644 --- a/aries_cloudcontroller/models/indy_pres_pred_spec.py +++ b/aries_cloudcontroller/models/indy_pres_pred_spec.py @@ -35,7 +35,7 @@ class IndyPresPredSpec(BaseModel): IndyPresPredSpec """ - cred_def_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_def_id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier" ) name: StrictStr = Field(description="Attribute name") diff --git a/aries_cloudcontroller/models/indy_primary_proof_eq_proof.py b/aries_cloudcontroller/models/indy_primary_proof_eq_proof.py index 36330551..6866c556 100644 --- a/aries_cloudcontroller/models/indy_primary_proof_eq_proof.py +++ b/aries_cloudcontroller/models/indy_primary_proof_eq_proof.py @@ -35,12 +35,12 @@ class IndyPrimaryProofEqProof(BaseModel): Indy equality proof # noqa: E501 """ - a_prime: Optional[Annotated[str, Field(strict=True)]] = None - e: Optional[Annotated[str, Field(strict=True)]] = None - m: Optional[Dict[str, Annotated[str, Field(strict=True)]]] = None - m2: Optional[Annotated[str, Field(strict=True)]] = None - revealed_attrs: Optional[Dict[str, Annotated[str, Field(strict=True)]]] = None - v: Optional[Annotated[str, Field(strict=True)]] = None + a_prime: Optional[StrictStr] = None + e: Optional[StrictStr] = None + m: Optional[Dict[str, StrictStr]] = None + m2: Optional[StrictStr] = None + revealed_attrs: Optional[Dict[str, StrictStr]] = None + v: Optional[StrictStr] = None __properties: ClassVar[List[str]] = [ "a_prime", "e", diff --git a/aries_cloudcontroller/models/indy_proof_identifier.py b/aries_cloudcontroller/models/indy_proof_identifier.py index 64f7e03d..13693217 100644 --- a/aries_cloudcontroller/models/indy_proof_identifier.py +++ b/aries_cloudcontroller/models/indy_proof_identifier.py @@ -35,13 +35,13 @@ class IndyProofIdentifier(BaseModel): IndyProofIdentifier """ - cred_def_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_def_id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier" ) - rev_reg_id: Optional[Annotated[str, Field(strict=True)]] = Field( + rev_reg_id: Optional[StrictStr] = Field( default=None, description="Revocation registry identifier" ) - schema_id: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_id: Optional[StrictStr] = Field( default=None, description="Schema identifier" ) timestamp: Optional[ diff --git a/aries_cloudcontroller/models/indy_proof_request.py b/aries_cloudcontroller/models/indy_proof_request.py index 6a87acf2..85186181 100644 --- a/aries_cloudcontroller/models/indy_proof_request.py +++ b/aries_cloudcontroller/models/indy_proof_request.py @@ -42,7 +42,7 @@ class IndyProofRequest(BaseModel): name: Optional[StrictStr] = Field(default=None, description="Proof request name") non_revoked: Optional[IndyProofRequestNonRevoked] = None - nonce: Optional[Annotated[str, Field(strict=True)]] = Field( + nonce: Optional[StrictStr] = Field( default=None, description="Nonce" ) requested_attributes: Dict[str, IndyProofReqAttrSpec] = Field( @@ -51,7 +51,7 @@ class IndyProofRequest(BaseModel): requested_predicates: Dict[str, IndyProofReqPredSpec] = Field( description="Requested predicate specifications of proof request" ) - version: Optional[Annotated[str, Field(strict=True)]] = Field( + version: Optional[StrictStr] = Field( default=None, description="Proof request version" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/indy_proof_requested_proof_revealed_attr.py b/aries_cloudcontroller/models/indy_proof_requested_proof_revealed_attr.py index a726acc7..dc47fff0 100644 --- a/aries_cloudcontroller/models/indy_proof_requested_proof_revealed_attr.py +++ b/aries_cloudcontroller/models/indy_proof_requested_proof_revealed_attr.py @@ -35,7 +35,7 @@ class IndyProofRequestedProofRevealedAttr(BaseModel): IndyProofRequestedProofRevealedAttr """ - encoded: Optional[Annotated[str, Field(strict=True)]] = Field( + encoded: Optional[StrictStr] = Field( default=None, description="Encoded value" ) raw: Optional[StrictStr] = Field(default=None, description="Raw value") diff --git a/aries_cloudcontroller/models/indy_rev_reg_def.py b/aries_cloudcontroller/models/indy_rev_reg_def.py index b05463be..6e997691 100644 --- a/aries_cloudcontroller/models/indy_rev_reg_def.py +++ b/aries_cloudcontroller/models/indy_rev_reg_def.py @@ -36,10 +36,10 @@ class IndyRevRegDef(BaseModel): IndyRevRegDef """ - cred_def_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_def_id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier", alias="credDefId" ) - id: Optional[Annotated[str, Field(strict=True)]] = Field( + id: Optional[StrictStr] = Field( default=None, description="Indy revocation registry identifier" ) revoc_def_type: Optional[StrictStr] = Field( @@ -51,7 +51,7 @@ class IndyRevRegDef(BaseModel): default=None, description="Revocation registry tag" ) value: Optional[IndyRevRegDefValue] = None - ver: Optional[Annotated[str, Field(strict=True)]] = Field( + ver: Optional[StrictStr] = Field( default=None, description="Version of revocation registry definition" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/indy_rev_reg_def_value.py b/aries_cloudcontroller/models/indy_rev_reg_def_value.py index 3d49b1f0..a9f29b89 100644 --- a/aries_cloudcontroller/models/indy_rev_reg_def_value.py +++ b/aries_cloudcontroller/models/indy_rev_reg_def_value.py @@ -49,7 +49,7 @@ class IndyRevRegDefValue(BaseModel): public_keys: Optional[IndyRevRegDefValuePublicKeys] = Field( default=None, alias="publicKeys" ) - tails_hash: Optional[Annotated[str, Field(strict=True)]] = Field( + tails_hash: Optional[StrictStr] = Field( default=None, description="Tails hash value", alias="tailsHash" ) tails_location: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/indy_rev_reg_entry.py b/aries_cloudcontroller/models/indy_rev_reg_entry.py index d7925636..652096b2 100644 --- a/aries_cloudcontroller/models/indy_rev_reg_entry.py +++ b/aries_cloudcontroller/models/indy_rev_reg_entry.py @@ -37,7 +37,7 @@ class IndyRevRegEntry(BaseModel): """ value: Optional[IndyRevRegEntryValue] = None - ver: Optional[Annotated[str, Field(strict=True)]] = Field( + ver: Optional[StrictStr] = Field( default=None, description="Version of revocation registry entry" ) __properties: ClassVar[List[str]] = ["value", "ver"] diff --git a/aries_cloudcontroller/models/invitation_create_request.py b/aries_cloudcontroller/models/invitation_create_request.py index bc39698c..16b1b332 100644 --- a/aries_cloudcontroller/models/invitation_create_request.py +++ b/aries_cloudcontroller/models/invitation_create_request.py @@ -53,7 +53,7 @@ class InvitationCreateRequest(BaseModel): description="A self-attested code the receiver may want to display to the user or use in automatically deciding what to do with the out-of-band message", ) handshake_protocols: Optional[List[StrictStr]] = None - mediation_id: Optional[Annotated[str, Field(strict=True)]] = Field( + mediation_id: Optional[StrictStr] = Field( default=None, description="Identifier for active mediation record to be used" ) metadata: Optional[Dict[str, Any]] = Field( diff --git a/aries_cloudcontroller/models/invitation_record.py b/aries_cloudcontroller/models/invitation_record.py index c1827681..867434bd 100644 --- a/aries_cloudcontroller/models/invitation_record.py +++ b/aries_cloudcontroller/models/invitation_record.py @@ -36,7 +36,7 @@ class InvitationRecord(BaseModel): InvitationRecord """ - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) invi_msg_id: Optional[StrictStr] = Field( @@ -59,7 +59,7 @@ class InvitationRecord(BaseModel): default=None, description="Record trace information, based on agent configuration", ) - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/issuer_cred_rev_record.py b/aries_cloudcontroller/models/issuer_cred_rev_record.py index fb7acd6f..79d72905 100644 --- a/aries_cloudcontroller/models/issuer_cred_rev_record.py +++ b/aries_cloudcontroller/models/issuer_cred_rev_record.py @@ -35,10 +35,10 @@ class IssuerCredRevRecord(BaseModel): IssuerCredRevRecord """ - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) - cred_def_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_def_id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier" ) cred_ex_id: Optional[StrictStr] = Field( @@ -48,19 +48,19 @@ class IssuerCredRevRecord(BaseModel): cred_ex_version: Optional[StrictStr] = Field( default=None, description="Credential exchange version" ) - cred_rev_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_rev_id: Optional[StrictStr] = Field( default=None, description="Credential revocation identifier" ) record_id: Optional[StrictStr] = Field( default=None, description="Issuer credential revocation record identifier" ) - rev_reg_id: Optional[Annotated[str, Field(strict=True)]] = Field( + rev_reg_id: Optional[StrictStr] = Field( default=None, description="Revocation registry identifier" ) state: Optional[StrictStr] = Field( default=None, description="Issue credential revocation record state" ) - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/issuer_rev_reg_record.py b/aries_cloudcontroller/models/issuer_rev_reg_record.py index 89c29b79..89089e25 100644 --- a/aries_cloudcontroller/models/issuer_rev_reg_record.py +++ b/aries_cloudcontroller/models/issuer_rev_reg_record.py @@ -37,14 +37,14 @@ class IssuerRevRegRecord(BaseModel): IssuerRevRegRecord """ - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) - cred_def_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_def_id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier" ) error_msg: Optional[StrictStr] = Field(default=None, description="Error message") - issuer_did: Optional[Annotated[str, Field(strict=True)]] = Field( + issuer_did: Optional[StrictStr] = Field( default=None, description="Issuer DID" ) max_cred_num: Optional[StrictInt] = Field( @@ -63,7 +63,7 @@ class IssuerRevRegRecord(BaseModel): ) revoc_reg_def: Optional[IndyRevRegDef] = None revoc_reg_entry: Optional[IndyRevRegEntry] = None - revoc_reg_id: Optional[Annotated[str, Field(strict=True)]] = Field( + revoc_reg_id: Optional[StrictStr] = Field( default=None, description="Revocation registry identifier" ) state: Optional[StrictStr] = Field( @@ -72,7 +72,7 @@ class IssuerRevRegRecord(BaseModel): tag: Optional[StrictStr] = Field( default=None, description="Tag within issuer revocation registry identifier" ) - tails_hash: Optional[Annotated[str, Field(strict=True)]] = Field( + tails_hash: Optional[StrictStr] = Field( default=None, description="Tails hash" ) tails_local_path: Optional[StrictStr] = Field( @@ -81,7 +81,7 @@ class IssuerRevRegRecord(BaseModel): tails_public_uri: Optional[StrictStr] = Field( default=None, description="Public URI for tails file" ) - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/jws_create.py b/aries_cloudcontroller/models/jws_create.py index 9a0d6072..119ddd84 100644 --- a/aries_cloudcontroller/models/jws_create.py +++ b/aries_cloudcontroller/models/jws_create.py @@ -35,12 +35,12 @@ class JWSCreate(BaseModel): JWSCreate """ - did: Optional[Annotated[str, Field(strict=True)]] = Field( + did: Optional[StrictStr] = Field( default=None, description="DID of interest" ) headers: Optional[Dict[str, Any]] = None payload: Dict[str, Any] - verification_method: Optional[Annotated[str, Field(strict=True)]] = Field( + verification_method: Optional[StrictStr] = Field( default=None, description="Information used for proof verification", alias="verificationMethod", diff --git a/aries_cloudcontroller/models/jws_verify.py b/aries_cloudcontroller/models/jws_verify.py index ef26a147..95cc185f 100644 --- a/aries_cloudcontroller/models/jws_verify.py +++ b/aries_cloudcontroller/models/jws_verify.py @@ -35,7 +35,7 @@ class JWSVerify(BaseModel): JWSVerify """ - jwt: Optional[Annotated[str, Field(strict=True)]] = None + jwt: Optional[StrictStr] = None __properties: ClassVar[List[str]] = ["jwt"] @field_validator("jwt") diff --git a/aries_cloudcontroller/models/keylist_update_rule.py b/aries_cloudcontroller/models/keylist_update_rule.py index 0be90ed0..b2b35eca 100644 --- a/aries_cloudcontroller/models/keylist_update_rule.py +++ b/aries_cloudcontroller/models/keylist_update_rule.py @@ -36,7 +36,7 @@ class KeylistUpdateRule(BaseModel): """ action: StrictStr = Field(description="Action for specific key") - recipient_key: Annotated[str, Field(strict=True)] = Field( + recipient_key: StrictStr = Field( description="Key to remove or add" ) __properties: ClassVar[List[str]] = ["action", "recipient_key"] diff --git a/aries_cloudcontroller/models/ld_proof_vc_detail_options.py b/aries_cloudcontroller/models/ld_proof_vc_detail_options.py index f542105d..3efad5ee 100644 --- a/aries_cloudcontroller/models/ld_proof_vc_detail_options.py +++ b/aries_cloudcontroller/models/ld_proof_vc_detail_options.py @@ -42,7 +42,7 @@ class LDProofVCDetailOptions(BaseModel): default=None, description="A challenge to include in the proof. SHOULD be provided by the requesting party of the credential (=holder)", ) - created: Optional[Annotated[str, Field(strict=True)]] = Field( + created: Optional[StrictStr] = Field( default=None, description="The date and time of the proof (with a maximum accuracy in seconds). Defaults to current system time", ) diff --git a/aries_cloudcontroller/models/linked_data_proof.py b/aries_cloudcontroller/models/linked_data_proof.py index 630f4680..69e6241b 100644 --- a/aries_cloudcontroller/models/linked_data_proof.py +++ b/aries_cloudcontroller/models/linked_data_proof.py @@ -39,10 +39,10 @@ class LinkedDataProof(BaseModel): default=None, description="Associates a challenge with a proof, for use with a proofPurpose such as authentication", ) - created: Annotated[str, Field(strict=True)] = Field( + created: StrictStr = Field( description="The string value of an ISO8601 combined date and time string generated by the Signature Algorithm" ) - domain: Optional[Annotated[str, Field(strict=True)]] = Field( + domain: Optional[StrictStr] = Field( default=None, description="A string value specifying the restricted domain of the signature.", ) @@ -58,7 +58,7 @@ class LinkedDataProof(BaseModel): type: StrictStr = Field( description="Identifies the digital signature suite that was used to create the signature" ) - verification_method: Annotated[str, Field(strict=True)] = Field( + verification_method: StrictStr = Field( description="Information used for proof verification", alias="verificationMethod", ) diff --git a/aries_cloudcontroller/models/mediation_record.py b/aries_cloudcontroller/models/mediation_record.py index 1201c9d2..e315ee8e 100644 --- a/aries_cloudcontroller/models/mediation_record.py +++ b/aries_cloudcontroller/models/mediation_record.py @@ -36,7 +36,7 @@ class MediationRecord(BaseModel): """ connection_id: StrictStr - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) endpoint: Optional[StrictStr] = None @@ -44,9 +44,9 @@ class MediationRecord(BaseModel): mediator_terms: Optional[List[StrictStr]] = None recipient_terms: Optional[List[StrictStr]] = None role: StrictStr - routing_keys: Optional[List[Annotated[str, Field(strict=True)]]] = None + routing_keys: Optional[List[StrictStr]] = None state: Optional[StrictStr] = Field(default=None, description="Current record state") - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/model_schema.py b/aries_cloudcontroller/models/model_schema.py index 315c626a..84d3d9be 100644 --- a/aries_cloudcontroller/models/model_schema.py +++ b/aries_cloudcontroller/models/model_schema.py @@ -38,17 +38,17 @@ class ModelSchema(BaseModel): attr_names: Optional[List[StrictStr]] = Field( default=None, description="Schema attribute names", alias="attrNames" ) - id: Optional[Annotated[str, Field(strict=True)]] = Field( + id: Optional[StrictStr] = Field( default=None, description="Schema identifier" ) name: Optional[StrictStr] = Field(default=None, description="Schema name") seq_no: Optional[Annotated[int, Field(strict=True, ge=1)]] = Field( default=None, description="Schema sequence number", alias="seqNo" ) - ver: Optional[Annotated[str, Field(strict=True)]] = Field( + ver: Optional[StrictStr] = Field( default=None, description="Node protocol version" ) - version: Optional[Annotated[str, Field(strict=True)]] = Field( + version: Optional[StrictStr] = Field( default=None, description="Schema version" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/oob_record.py b/aries_cloudcontroller/models/oob_record.py index bbb4603d..9759cb6c 100644 --- a/aries_cloudcontroller/models/oob_record.py +++ b/aries_cloudcontroller/models/oob_record.py @@ -43,7 +43,7 @@ class OobRecord(BaseModel): connection_id: Optional[StrictStr] = Field( default=None, description="Connection record identifier" ) - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) invi_msg_id: StrictStr = Field(description="Invitation message identifier") @@ -59,7 +59,7 @@ class OobRecord(BaseModel): default=None, description="Record trace information, based on agent configuration", ) - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/presentation_definition.py b/aries_cloudcontroller/models/presentation_definition.py index 2b92a9e6..5252728d 100644 --- a/aries_cloudcontroller/models/presentation_definition.py +++ b/aries_cloudcontroller/models/presentation_definition.py @@ -39,7 +39,7 @@ class PresentationDefinition(BaseModel): """ format: Optional[ClaimFormat] = None - id: Optional[Annotated[str, Field(strict=True)]] = Field( + id: Optional[StrictStr] = Field( default=None, description="Unique Resource Identifier" ) input_descriptors: Optional[List[InputDescriptors]] = None diff --git a/aries_cloudcontroller/models/publish_revocations.py b/aries_cloudcontroller/models/publish_revocations.py index fd209135..e23db994 100644 --- a/aries_cloudcontroller/models/publish_revocations.py +++ b/aries_cloudcontroller/models/publish_revocations.py @@ -34,7 +34,7 @@ class PublishRevocations(BaseModel): PublishRevocations """ - rrid2crid: Optional[Dict[str, List[Annotated[str, Field(strict=True)]]]] = Field( + rrid2crid: Optional[Dict[str, List[StrictStr]]] = Field( default=None, description="Credential revocation ids by revocation registry id" ) __properties: ClassVar[List[str]] = ["rrid2crid"] diff --git a/aries_cloudcontroller/models/raw_encoded.py b/aries_cloudcontroller/models/raw_encoded.py index c536ffe3..a1d6c584 100644 --- a/aries_cloudcontroller/models/raw_encoded.py +++ b/aries_cloudcontroller/models/raw_encoded.py @@ -35,7 +35,7 @@ class RawEncoded(BaseModel): RawEncoded """ - encoded: Optional[Annotated[str, Field(strict=True)]] = Field( + encoded: Optional[StrictStr] = Field( default=None, description="Encoded value" ) raw: Optional[StrictStr] = Field(default=None, description="Raw value") diff --git a/aries_cloudcontroller/models/receive_invitation_request.py b/aries_cloudcontroller/models/receive_invitation_request.py index 21ccbb5f..d6c9aca9 100644 --- a/aries_cloudcontroller/models/receive_invitation_request.py +++ b/aries_cloudcontroller/models/receive_invitation_request.py @@ -41,7 +41,7 @@ class ReceiveInvitationRequest(BaseModel): type: Optional[StrictStr] = Field( default=None, description="Message type", alias="@type" ) - did: Optional[Annotated[str, Field(strict=True)]] = Field( + did: Optional[StrictStr] = Field( default=None, description="DID for connection invitation" ) image_url: Optional[StrictStr] = Field( @@ -52,10 +52,10 @@ class ReceiveInvitationRequest(BaseModel): label: Optional[StrictStr] = Field( default=None, description="Optional label for connection invitation" ) - recipient_keys: Optional[List[Annotated[str, Field(strict=True)]]] = Field( + recipient_keys: Optional[List[StrictStr]] = Field( default=None, description="List of recipient keys", alias="recipientKeys" ) - routing_keys: Optional[List[Annotated[str, Field(strict=True)]]] = Field( + routing_keys: Optional[List[StrictStr]] = Field( default=None, description="List of routing keys", alias="routingKeys" ) service_endpoint: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/rev_reg_create_request.py b/aries_cloudcontroller/models/rev_reg_create_request.py index b0928c30..4d3eb89d 100644 --- a/aries_cloudcontroller/models/rev_reg_create_request.py +++ b/aries_cloudcontroller/models/rev_reg_create_request.py @@ -35,7 +35,7 @@ class RevRegCreateRequest(BaseModel): RevRegCreateRequest """ - credential_definition_id: Optional[Annotated[str, Field(strict=True)]] = Field( + credential_definition_id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier" ) max_cred_num: Optional[Annotated[int, Field(le=32768, strict=True, ge=4)]] = Field( diff --git a/aries_cloudcontroller/models/rev_regs_created.py b/aries_cloudcontroller/models/rev_regs_created.py index d42e1eed..066c1cd4 100644 --- a/aries_cloudcontroller/models/rev_regs_created.py +++ b/aries_cloudcontroller/models/rev_regs_created.py @@ -34,7 +34,7 @@ class RevRegsCreated(BaseModel): RevRegsCreated """ - rev_reg_ids: Optional[List[Annotated[str, Field(strict=True)]]] = None + rev_reg_ids: Optional[List[StrictStr]] = None __properties: ClassVar[List[str]] = ["rev_reg_ids"] model_config = DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/revoke_request.py b/aries_cloudcontroller/models/revoke_request.py index a19dcbdf..d7e5a7f7 100644 --- a/aries_cloudcontroller/models/revoke_request.py +++ b/aries_cloudcontroller/models/revoke_request.py @@ -39,14 +39,14 @@ class RevokeRequest(BaseModel): default=None, description="Optional comment to include in revocation notification", ) - connection_id: Optional[Annotated[str, Field(strict=True)]] = Field( + connection_id: Optional[StrictStr] = Field( default=None, description="Connection ID to which the revocation notification will be sent; required if notify is true", ) - cred_ex_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_ex_id: Optional[StrictStr] = Field( default=None, description="Credential exchange identifier" ) - cred_rev_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_rev_id: Optional[StrictStr] = Field( default=None, description="Credential revocation identifier" ) notify: Optional[StrictBool] = Field( @@ -60,7 +60,7 @@ class RevokeRequest(BaseModel): default=None, description="(True) publish revocation to ledger immediately, or (default, False) mark it pending", ) - rev_reg_id: Optional[Annotated[str, Field(strict=True)]] = Field( + rev_reg_id: Optional[StrictStr] = Field( default=None, description="Revocation registry identifier" ) thread_id: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/route_record.py b/aries_cloudcontroller/models/route_record.py index fe424de3..6c8db9eb 100644 --- a/aries_cloudcontroller/models/route_record.py +++ b/aries_cloudcontroller/models/route_record.py @@ -36,14 +36,14 @@ class RouteRecord(BaseModel): """ connection_id: Optional[StrictStr] = None - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) recipient_key: StrictStr record_id: Optional[StrictStr] = None role: Optional[StrictStr] = None state: Optional[StrictStr] = Field(default=None, description="Current record state") - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) wallet_id: Optional[StrictStr] = None diff --git a/aries_cloudcontroller/models/schema_send_request.py b/aries_cloudcontroller/models/schema_send_request.py index bfda7d84..bc90ff3d 100644 --- a/aries_cloudcontroller/models/schema_send_request.py +++ b/aries_cloudcontroller/models/schema_send_request.py @@ -37,7 +37,7 @@ class SchemaSendRequest(BaseModel): attributes: List[StrictStr] = Field(description="List of schema attributes") schema_name: StrictStr = Field(description="Schema name") - schema_version: Annotated[str, Field(strict=True)] = Field( + schema_version: StrictStr = Field( description="Schema version" ) __properties: ClassVar[List[str]] = ["attributes", "schema_name", "schema_version"] diff --git a/aries_cloudcontroller/models/schema_send_result.py b/aries_cloudcontroller/models/schema_send_result.py index df44d686..d42d783a 100644 --- a/aries_cloudcontroller/models/schema_send_result.py +++ b/aries_cloudcontroller/models/schema_send_result.py @@ -37,7 +37,7 @@ class SchemaSendResult(BaseModel): """ var_schema: Optional[ModelSchema] = Field(default=None, alias="schema") - schema_id: Annotated[str, Field(strict=True)] = Field( + schema_id: StrictStr = Field( description="Schema identifier" ) __properties: ClassVar[List[str]] = ["schema", "schema_id"] diff --git a/aries_cloudcontroller/models/schemas_created_result.py b/aries_cloudcontroller/models/schemas_created_result.py index 1e1755fe..f4df23db 100644 --- a/aries_cloudcontroller/models/schemas_created_result.py +++ b/aries_cloudcontroller/models/schemas_created_result.py @@ -34,7 +34,7 @@ class SchemasCreatedResult(BaseModel): SchemasCreatedResult """ - schema_ids: Optional[List[Annotated[str, Field(strict=True)]]] = None + schema_ids: Optional[List[StrictStr]] = None __properties: ClassVar[List[str]] = ["schema_ids"] model_config = DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/service_decorator.py b/aries_cloudcontroller/models/service_decorator.py index d51b5428..168a89d1 100644 --- a/aries_cloudcontroller/models/service_decorator.py +++ b/aries_cloudcontroller/models/service_decorator.py @@ -34,10 +34,10 @@ class ServiceDecorator(BaseModel): ServiceDecorator """ - recipient_keys: Optional[List[Annotated[str, Field(strict=True)]]] = Field( + recipient_keys: Optional[List[StrictStr]] = Field( default=None, description="List of recipient keys", alias="recipientKeys" ) - routing_keys: Optional[List[Annotated[str, Field(strict=True)]]] = Field( + routing_keys: Optional[List[StrictStr]] = Field( default=None, description="List of routing keys", alias="routingKeys" ) service_endpoint: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/transaction_record.py b/aries_cloudcontroller/models/transaction_record.py index 61f83500..b9deb184 100644 --- a/aries_cloudcontroller/models/transaction_record.py +++ b/aries_cloudcontroller/models/transaction_record.py @@ -42,7 +42,7 @@ class TransactionRecord(BaseModel): default=None, description="The connection identifier for thie particular transaction record", ) - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) endorser_write_txn: Optional[StrictBool] = Field( @@ -66,7 +66,7 @@ class TransactionRecord(BaseModel): transaction_id: Optional[StrictStr] = Field( default=None, description="Transaction identifier" ) - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/v10_credential_conn_free_offer_request.py b/aries_cloudcontroller/models/v10_credential_conn_free_offer_request.py index c3668697..65cfa355 100644 --- a/aries_cloudcontroller/models/v10_credential_conn_free_offer_request.py +++ b/aries_cloudcontroller/models/v10_credential_conn_free_offer_request.py @@ -47,7 +47,7 @@ class V10CredentialConnFreeOfferRequest(BaseModel): comment: Optional[StrictStr] = Field( default=None, description="Human-readable comment" ) - cred_def_id: Annotated[str, Field(strict=True)] = Field( + cred_def_id: StrictStr = Field( description="Credential definition identifier" ) credential_preview: CredentialPreview diff --git a/aries_cloudcontroller/models/v10_credential_create.py b/aries_cloudcontroller/models/v10_credential_create.py index e3af678d..95057dbe 100644 --- a/aries_cloudcontroller/models/v10_credential_create.py +++ b/aries_cloudcontroller/models/v10_credential_create.py @@ -43,21 +43,21 @@ class V10CredentialCreate(BaseModel): comment: Optional[StrictStr] = Field( default=None, description="Human-readable comment" ) - cred_def_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_def_id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier" ) credential_proposal: CredentialPreview - issuer_did: Optional[Annotated[str, Field(strict=True)]] = Field( + issuer_did: Optional[StrictStr] = Field( default=None, description="Credential issuer DID" ) - schema_id: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_id: Optional[StrictStr] = Field( default=None, description="Schema identifier" ) - schema_issuer_did: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_issuer_did: Optional[StrictStr] = Field( default=None, description="Schema issuer DID" ) schema_name: Optional[StrictStr] = Field(default=None, description="Schema name") - schema_version: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_version: Optional[StrictStr] = Field( default=None, description="Schema version" ) trace: Optional[StrictBool] = Field( diff --git a/aries_cloudcontroller/models/v10_credential_exchange.py b/aries_cloudcontroller/models/v10_credential_exchange.py index 90f6362d..020b1baf 100644 --- a/aries_cloudcontroller/models/v10_credential_exchange.py +++ b/aries_cloudcontroller/models/v10_credential_exchange.py @@ -56,11 +56,11 @@ class V10CredentialExchange(BaseModel): connection_id: Optional[StrictStr] = Field( default=None, description="Connection identifier" ) - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) credential: Optional[IndyCredInfo] = None - credential_definition_id: Optional[Annotated[str, Field(strict=True)]] = Field( + credential_definition_id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier" ) credential_exchange_id: Optional[StrictStr] = Field( @@ -94,7 +94,7 @@ class V10CredentialExchange(BaseModel): role: Optional[StrictStr] = Field( default=None, description="Issue-credential exchange role: holder or issuer" ) - schema_id: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_id: Optional[StrictStr] = Field( default=None, description="Schema identifier" ) state: Optional[StrictStr] = Field( @@ -107,7 +107,7 @@ class V10CredentialExchange(BaseModel): default=None, description="Record trace information, based on agent configuration", ) - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/v10_credential_free_offer_request.py b/aries_cloudcontroller/models/v10_credential_free_offer_request.py index 20201dfc..ec153e11 100644 --- a/aries_cloudcontroller/models/v10_credential_free_offer_request.py +++ b/aries_cloudcontroller/models/v10_credential_free_offer_request.py @@ -48,7 +48,7 @@ class V10CredentialFreeOfferRequest(BaseModel): default=None, description="Human-readable comment" ) connection_id: StrictStr = Field(description="Connection identifier") - cred_def_id: Annotated[str, Field(strict=True)] = Field( + cred_def_id: StrictStr = Field( description="Credential definition identifier" ) credential_preview: CredentialPreview diff --git a/aries_cloudcontroller/models/v10_credential_proposal_request_mand.py b/aries_cloudcontroller/models/v10_credential_proposal_request_mand.py index 5575b6b3..1ddbbfd4 100644 --- a/aries_cloudcontroller/models/v10_credential_proposal_request_mand.py +++ b/aries_cloudcontroller/models/v10_credential_proposal_request_mand.py @@ -44,21 +44,21 @@ class V10CredentialProposalRequestMand(BaseModel): default=None, description="Human-readable comment" ) connection_id: StrictStr = Field(description="Connection identifier") - cred_def_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_def_id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier" ) credential_proposal: CredentialPreview - issuer_did: Optional[Annotated[str, Field(strict=True)]] = Field( + issuer_did: Optional[StrictStr] = Field( default=None, description="Credential issuer DID" ) - schema_id: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_id: Optional[StrictStr] = Field( default=None, description="Schema identifier" ) - schema_issuer_did: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_issuer_did: Optional[StrictStr] = Field( default=None, description="Schema issuer DID" ) schema_name: Optional[StrictStr] = Field(default=None, description="Schema name") - schema_version: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_version: Optional[StrictStr] = Field( default=None, description="Schema version" ) trace: Optional[StrictBool] = Field( diff --git a/aries_cloudcontroller/models/v10_credential_proposal_request_opt.py b/aries_cloudcontroller/models/v10_credential_proposal_request_opt.py index 6a2576a9..71cf79dc 100644 --- a/aries_cloudcontroller/models/v10_credential_proposal_request_opt.py +++ b/aries_cloudcontroller/models/v10_credential_proposal_request_opt.py @@ -44,21 +44,21 @@ class V10CredentialProposalRequestOpt(BaseModel): default=None, description="Human-readable comment" ) connection_id: StrictStr = Field(description="Connection identifier") - cred_def_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_def_id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier" ) credential_proposal: Optional[CredentialPreview] = None - issuer_did: Optional[Annotated[str, Field(strict=True)]] = Field( + issuer_did: Optional[StrictStr] = Field( default=None, description="Credential issuer DID" ) - schema_id: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_id: Optional[StrictStr] = Field( default=None, description="Schema identifier" ) - schema_issuer_did: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_issuer_did: Optional[StrictStr] = Field( default=None, description="Schema issuer DID" ) schema_name: Optional[StrictStr] = Field(default=None, description="Schema name") - schema_version: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_version: Optional[StrictStr] = Field( default=None, description="Schema version" ) trace: Optional[StrictBool] = Field( diff --git a/aries_cloudcontroller/models/v10_discovery_record.py b/aries_cloudcontroller/models/v10_discovery_record.py index 963be407..33f0a27b 100644 --- a/aries_cloudcontroller/models/v10_discovery_record.py +++ b/aries_cloudcontroller/models/v10_discovery_record.py @@ -40,7 +40,7 @@ class V10DiscoveryRecord(BaseModel): connection_id: Optional[StrictStr] = Field( default=None, description="Connection identifier" ) - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) disclose: Optional[Disclose] = None @@ -56,7 +56,7 @@ class V10DiscoveryRecord(BaseModel): default=None, description="Record trace information, based on agent configuration", ) - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/v10_presentation_exchange.py b/aries_cloudcontroller/models/v10_presentation_exchange.py index 64f3e889..b604d67c 100644 --- a/aries_cloudcontroller/models/v10_presentation_exchange.py +++ b/aries_cloudcontroller/models/v10_presentation_exchange.py @@ -49,7 +49,7 @@ class V10PresentationExchange(BaseModel): connection_id: Optional[StrictStr] = Field( default=None, description="Connection identifier" ) - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) error_msg: Optional[StrictStr] = Field(default=None, description="Error message") @@ -76,7 +76,7 @@ class V10PresentationExchange(BaseModel): default=None, description="Record trace information, based on agent configuration", ) - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) verified: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/v20_cred_ex_record.py b/aries_cloudcontroller/models/v20_cred_ex_record.py index 2a10f575..6d57c05e 100644 --- a/aries_cloudcontroller/models/v20_cred_ex_record.py +++ b/aries_cloudcontroller/models/v20_cred_ex_record.py @@ -59,7 +59,7 @@ class V20CredExRecord(BaseModel): connection_id: Optional[StrictStr] = Field( default=None, description="Connection identifier" ) - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) cred_ex_id: Optional[StrictStr] = Field( @@ -91,7 +91,7 @@ class V20CredExRecord(BaseModel): default=None, description="Record trace information, based on agent configuration", ) - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/v20_cred_ex_record_indy.py b/aries_cloudcontroller/models/v20_cred_ex_record_indy.py index 5ae06e0e..488a0f47 100644 --- a/aries_cloudcontroller/models/v20_cred_ex_record_indy.py +++ b/aries_cloudcontroller/models/v20_cred_ex_record_indy.py @@ -35,7 +35,7 @@ class V20CredExRecordIndy(BaseModel): V20CredExRecordIndy """ - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) cred_ex_id: Optional[StrictStr] = Field( @@ -51,15 +51,15 @@ class V20CredExRecordIndy(BaseModel): cred_request_metadata: Optional[Dict[str, Any]] = Field( default=None, description="Credential request metadata for indy holder" ) - cred_rev_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_rev_id: Optional[StrictStr] = Field( default=None, description="Credential revocation identifier within revocation registry", ) - rev_reg_id: Optional[Annotated[str, Field(strict=True)]] = Field( + rev_reg_id: Optional[StrictStr] = Field( default=None, description="Revocation registry identifier" ) state: Optional[StrictStr] = Field(default=None, description="Current record state") - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/v20_cred_ex_record_ld_proof.py b/aries_cloudcontroller/models/v20_cred_ex_record_ld_proof.py index 508dc1d4..a8ec3a3e 100644 --- a/aries_cloudcontroller/models/v20_cred_ex_record_ld_proof.py +++ b/aries_cloudcontroller/models/v20_cred_ex_record_ld_proof.py @@ -35,7 +35,7 @@ class V20CredExRecordLDProof(BaseModel): V20CredExRecordLDProof """ - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) cred_ex_id: Optional[StrictStr] = Field( @@ -49,7 +49,7 @@ class V20CredExRecordLDProof(BaseModel): default=None, description="Credential identifier stored in wallet" ) state: Optional[StrictStr] = Field(default=None, description="Current record state") - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/v20_cred_filter_indy.py b/aries_cloudcontroller/models/v20_cred_filter_indy.py index b71952ca..7114f3ae 100644 --- a/aries_cloudcontroller/models/v20_cred_filter_indy.py +++ b/aries_cloudcontroller/models/v20_cred_filter_indy.py @@ -35,20 +35,20 @@ class V20CredFilterIndy(BaseModel): V20CredFilterIndy """ - cred_def_id: Optional[Annotated[str, Field(strict=True)]] = Field( + cred_def_id: Optional[StrictStr] = Field( default=None, description="Credential definition identifier" ) - issuer_did: Optional[Annotated[str, Field(strict=True)]] = Field( + issuer_did: Optional[StrictStr] = Field( default=None, description="Credential issuer DID" ) - schema_id: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_id: Optional[StrictStr] = Field( default=None, description="Schema identifier" ) - schema_issuer_did: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_issuer_did: Optional[StrictStr] = Field( default=None, description="Schema issuer DID" ) schema_name: Optional[StrictStr] = Field(default=None, description="Schema name") - schema_version: Optional[Annotated[str, Field(strict=True)]] = Field( + schema_version: Optional[StrictStr] = Field( default=None, description="Schema version" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/v20_discovery_record.py b/aries_cloudcontroller/models/v20_discovery_record.py index ccb9d697..c0ba4aa8 100644 --- a/aries_cloudcontroller/models/v20_discovery_record.py +++ b/aries_cloudcontroller/models/v20_discovery_record.py @@ -40,7 +40,7 @@ class V20DiscoveryRecord(BaseModel): connection_id: Optional[StrictStr] = Field( default=None, description="Connection identifier" ) - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) disclosures: Optional[Disclosures] = None @@ -56,7 +56,7 @@ class V20DiscoveryRecord(BaseModel): default=None, description="Record trace information, based on agent configuration", ) - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) __properties: ClassVar[List[str]] = [ diff --git a/aries_cloudcontroller/models/v20_pres_ex_record.py b/aries_cloudcontroller/models/v20_pres_ex_record.py index f20d665f..0229b213 100644 --- a/aries_cloudcontroller/models/v20_pres_ex_record.py +++ b/aries_cloudcontroller/models/v20_pres_ex_record.py @@ -52,7 +52,7 @@ class V20PresExRecord(BaseModel): connection_id: Optional[StrictStr] = Field( default=None, description="Connection identifier" ) - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) error_msg: Optional[StrictStr] = Field(default=None, description="Error message") @@ -78,7 +78,7 @@ class V20PresExRecord(BaseModel): default=None, description="Record trace information, based on agent configuration", ) - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) verified: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/vc_record.py b/aries_cloudcontroller/models/vc_record.py index 2c9fe58c..f28462d0 100644 --- a/aries_cloudcontroller/models/vc_record.py +++ b/aries_cloudcontroller/models/vc_record.py @@ -34,7 +34,7 @@ class VCRecord(BaseModel): VCRecord """ - contexts: Optional[List[Annotated[str, Field(strict=True)]]] = None + contexts: Optional[List[StrictStr]] = None cred_tags: Optional[Dict[str, StrictStr]] = None cred_value: Optional[Dict[str, Any]] = Field( default=None, description="(JSON-serializable) credential value" diff --git a/aries_cloudcontroller/models/w3_c_credentials_list_request.py b/aries_cloudcontroller/models/w3_c_credentials_list_request.py index 4e5b962a..3ddc01ca 100644 --- a/aries_cloudcontroller/models/w3_c_credentials_list_request.py +++ b/aries_cloudcontroller/models/w3_c_credentials_list_request.py @@ -34,7 +34,7 @@ class W3CCredentialsListRequest(BaseModel): W3CCredentialsListRequest """ - contexts: Optional[List[Annotated[str, Field(strict=True)]]] = None + contexts: Optional[List[StrictStr]] = None given_id: Optional[StrictStr] = Field( default=None, description="Given credential id to match" ) @@ -45,7 +45,7 @@ class W3CCredentialsListRequest(BaseModel): default=None, description="Maximum number of results to return" ) proof_types: Optional[List[StrictStr]] = None - schema_ids: Optional[List[Annotated[str, Field(strict=True)]]] = Field( + schema_ids: Optional[List[StrictStr]] = Field( default=None, description="Schema identifiers, all of which to match" ) subject_ids: Optional[List[StrictStr]] = Field( @@ -54,7 +54,7 @@ class W3CCredentialsListRequest(BaseModel): tag_query: Optional[Dict[str, StrictStr]] = Field( default=None, description="Tag filter" ) - types: Optional[List[Annotated[str, Field(strict=True)]]] = None + types: Optional[List[StrictStr]] = None __properties: ClassVar[List[str]] = [ "contexts", "given_id", diff --git a/aries_cloudcontroller/models/wallet_record.py b/aries_cloudcontroller/models/wallet_record.py index efb11e3a..ff0a8ce0 100644 --- a/aries_cloudcontroller/models/wallet_record.py +++ b/aries_cloudcontroller/models/wallet_record.py @@ -35,7 +35,7 @@ class WalletRecord(BaseModel): WalletRecord """ - created_at: Optional[Annotated[str, Field(strict=True)]] = Field( + created_at: Optional[StrictStr] = Field( default=None, description="Time of record creation" ) key_management_mode: StrictStr = Field( @@ -45,7 +45,7 @@ class WalletRecord(BaseModel): default=None, description="Settings for this wallet." ) state: Optional[StrictStr] = Field(default=None, description="Current record state") - updated_at: Optional[Annotated[str, Field(strict=True)]] = Field( + updated_at: Optional[StrictStr] = Field( default=None, description="Time of last record update" ) wallet_id: StrictStr = Field(description="Wallet record ID") diff --git a/generator/scripts/postprocess-client.sh b/generator/scripts/postprocess-client.sh index ff4c63bf..841637ae 100755 --- a/generator/scripts/postprocess-client.sh +++ b/generator/scripts/postprocess-client.sh @@ -57,6 +57,9 @@ sed -i 's/services: Optional\[List\[Union\[str, Any\]\]\]/services: Optional\[Li # Fix Union[str,Any] should be Dict[str,Any]! Most of them are wrapped in Optional[..] and some in List[..]. But all can safely be replaced (there are no valid Union[str, Any]'s, all must be Dict) sed -i 's/Union\[str, Any\]/Dict[str, Any]/g' aries_cloudcontroller/models/*.py +# Replace all `Annotated[str, Field(strict=True)]` with `StrictStr` (the one is simpler than the other ...) +sed -i 's/Annotated\[str, Field(strict=True)\]/StrictStr/g' aries_cloudcontroller/*/*.py + # NB: # There are 3 more models, and 1 API Module, that we are not amending automatically. These should be reviewed manually: # - MultitenancyAPI has custom method to handle our groups plugin! From 6925cdfa33431d1cdca130b4eabf6b7ca80ad41e Mon Sep 17 00:00:00 2001 From: ff137 Date: Fri, 10 Nov 2023 12:06:10 +0200 Subject: [PATCH 4/9] :art: autoflake and format --- aries_cloudcontroller/api/connection_api.py | 8 ++------ aries_cloudcontroller/models/admin_config.py | 2 +- aries_cloudcontroller/models/admin_status.py | 2 +- aries_cloudcontroller/models/attach_decorator.py | 1 - .../models/attach_decorator_data.py | 1 - .../models/attach_decorator_data1_jws.py | 1 - .../models/attach_decorator_data_jws.py | 5 +---- .../models/attach_decorator_data_jws_header.py | 1 - aries_cloudcontroller/models/claim_format.py | 2 +- .../models/clear_pending_revocations_request.py | 1 - aries_cloudcontroller/models/conn_record.py | 1 - .../models/connection_invitation.py | 1 - aries_cloudcontroller/models/connection_metadata.py | 2 +- .../models/connection_metadata_set_request.py | 2 +- .../models/connection_static_request.py | 9 ++------- .../models/connection_static_result.py | 13 +++---------- .../models/create_invitation_request.py | 3 +-- .../models/create_wallet_request.py | 2 +- .../models/create_wallet_response.py | 3 +-- .../models/cred_def_value_primary.py | 3 +-- .../models/cred_rev_indy_records_result.py | 2 +- aries_cloudcontroller/models/credential.py | 1 - .../models/credential_definition.py | 5 +---- .../models/credential_definition_send_result.py | 1 - .../models/credential_definitions_created_result.py | 3 +-- aries_cloudcontroller/models/credential_proposal.py | 1 - aries_cloudcontroller/models/did.py | 5 +---- aries_cloudcontroller/models/did_create_options.py | 1 - aries_cloudcontroller/models/did_endpoint.py | 1 - .../models/did_endpoint_with_type.py | 1 - aries_cloudcontroller/models/didx_request.py | 5 +---- aries_cloudcontroller/models/dif_holder.py | 1 - aries_cloudcontroller/models/dif_options.py | 1 - aries_cloudcontroller/models/dif_pres_spec.py | 2 +- aries_cloudcontroller/models/disclosures.py | 2 +- aries_cloudcontroller/models/doc.py | 2 +- aries_cloudcontroller/models/endpoints_result.py | 5 +---- aries_cloudcontroller/models/generated.py | 3 +-- .../models/get_did_endpoint_response.py | 1 - .../models/get_did_verkey_response.py | 1 - aries_cloudcontroller/models/indy_attr_value.py | 5 +---- aries_cloudcontroller/models/indy_cred_abstract.py | 13 +++---------- aries_cloudcontroller/models/indy_cred_info.py | 1 - aries_cloudcontroller/models/indy_cred_request.py | 11 +++-------- aries_cloudcontroller/models/indy_credential.py | 11 +++-------- aries_cloudcontroller/models/indy_eq_proof.py | 3 +-- aries_cloudcontroller/models/indy_ge_proof.py | 3 +-- .../models/indy_key_correctness_proof.py | 9 ++------- aries_cloudcontroller/models/indy_pres_attr_spec.py | 1 - aries_cloudcontroller/models/indy_pres_pred_spec.py | 1 - .../models/indy_primary_proof_eq_proof.py | 3 +-- aries_cloudcontroller/models/indy_proof_request.py | 5 +---- .../models/indy_proof_requested_proof.py | 2 +- .../indy_proof_requested_proof_revealed_attr.py | 5 +---- aries_cloudcontroller/models/indy_rev_reg_def.py | 1 - aries_cloudcontroller/models/indy_rev_reg_entry.py | 1 - aries_cloudcontroller/models/input_descriptors.py | 2 +- .../models/invitation_create_request.py | 3 +-- aries_cloudcontroller/models/invitation_record.py | 1 - .../models/issuer_cred_rev_record.py | 1 - .../models/issuer_rev_reg_record.py | 9 ++------- aries_cloudcontroller/models/jws_create.py | 7 ++----- aries_cloudcontroller/models/jws_verify.py | 3 +-- aries_cloudcontroller/models/jws_verify_response.py | 2 +- aries_cloudcontroller/models/keylist_query.py | 2 +- .../models/keylist_query_filter_request.py | 2 +- aries_cloudcontroller/models/keylist_update_rule.py | 5 +---- .../models/ld_proof_vc_detail_options.py | 1 - aries_cloudcontroller/models/linked_data_proof.py | 1 - aries_cloudcontroller/models/mediation_record.py | 1 - aries_cloudcontroller/models/model_schema.py | 12 +++--------- aries_cloudcontroller/models/oob_record.py | 1 - .../models/presentation_definition.py | 1 - aries_cloudcontroller/models/profile_settings.py | 2 +- aries_cloudcontroller/models/publish_revocations.py | 1 - aries_cloudcontroller/models/raw_encoded.py | 5 +---- .../models/receive_invitation_request.py | 1 - aries_cloudcontroller/models/resolution_result.py | 2 +- .../models/rev_reg_wallet_updated_result.py | 2 +- aries_cloudcontroller/models/rev_regs_created.py | 3 +-- aries_cloudcontroller/models/revoke_request.py | 1 - aries_cloudcontroller/models/route_record.py | 1 - aries_cloudcontroller/models/schema_send_request.py | 5 +---- aries_cloudcontroller/models/schema_send_result.py | 5 +---- .../models/schemas_created_result.py | 3 +-- aries_cloudcontroller/models/service_decorator.py | 1 - aries_cloudcontroller/models/sign_response.py | 2 +- aries_cloudcontroller/models/transaction_record.py | 3 +-- .../models/update_profile_settings.py | 2 +- .../models/update_wallet_request.py | 2 +- .../v10_credential_conn_free_offer_request.py | 5 +---- .../models/v10_credential_create.py | 1 - .../models/v10_credential_exchange.py | 3 +-- .../models/v10_credential_free_offer_request.py | 5 +---- .../models/v10_credential_proposal_request_mand.py | 1 - .../models/v10_credential_proposal_request_opt.py | 1 - .../models/v10_discovery_record.py | 1 - .../models/v10_presentation_exchange.py | 1 - aries_cloudcontroller/models/v20_cred_ex_record.py | 1 - .../models/v20_cred_ex_record_by_format.py | 2 +- .../models/v20_cred_ex_record_indy.py | 3 +-- .../models/v20_cred_ex_record_ld_proof.py | 1 - .../models/v20_cred_filter_indy.py | 1 - .../models/v20_discovery_record.py | 1 - aries_cloudcontroller/models/v20_pres_ex_record.py | 1 - .../models/v20_pres_ex_record_by_format.py | 2 +- aries_cloudcontroller/models/vc_record.py | 3 +-- .../models/w3_c_credentials_list_request.py | 1 - aries_cloudcontroller/models/wallet_record.py | 3 +-- 109 files changed, 79 insertions(+), 235 deletions(-) diff --git a/aries_cloudcontroller/api/connection_api.py b/aries_cloudcontroller/api/connection_api.py index 05791559..611737a0 100644 --- a/aries_cloudcontroller/api/connection_api.py +++ b/aries_cloudcontroller/api/connection_api.py @@ -1291,9 +1291,7 @@ async def get_connections( Optional[StrictStr], Field(description="Identifier of the associated Invitation Mesage"), ] = None, - my_did: Annotated[ - Optional[StrictStr], Field(description="My DID") - ] = None, + my_did: Annotated[Optional[StrictStr], Field(description="My DID")] = None, state: Annotated[ Optional[StrictStr], Field(description="Connection state") ] = None, @@ -1373,9 +1371,7 @@ async def get_connections_with_http_info( Optional[StrictStr], Field(description="Identifier of the associated Invitation Mesage"), ] = None, - my_did: Annotated[ - Optional[StrictStr], Field(description="My DID") - ] = None, + my_did: Annotated[Optional[StrictStr], Field(description="My DID")] = None, state: Annotated[ Optional[StrictStr], Field(description="Connection state") ] = None, diff --git a/aries_cloudcontroller/models/admin_config.py b/aries_cloudcontroller/models/admin_config.py index 5dc39cf2..16526fa6 100644 --- a/aries_cloudcontroller/models/admin_config.py +++ b/aries_cloudcontroller/models/admin_config.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field diff --git a/aries_cloudcontroller/models/admin_status.py b/aries_cloudcontroller/models/admin_status.py index ae7848e5..99eed320 100644 --- a/aries_cloudcontroller/models/admin_status.py +++ b/aries_cloudcontroller/models/admin_status.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr diff --git a/aries_cloudcontroller/models/attach_decorator.py b/aries_cloudcontroller/models/attach_decorator.py index f86dee29..64fed998 100644 --- a/aries_cloudcontroller/models/attach_decorator.py +++ b/aries_cloudcontroller/models/attach_decorator.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictInt, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.attach_decorator_data import AttachDecoratorData from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/attach_decorator_data.py b/aries_cloudcontroller/models/attach_decorator_data.py index 38dd211c..c53d863c 100644 --- a/aries_cloudcontroller/models/attach_decorator_data.py +++ b/aries_cloudcontroller/models/attach_decorator_data.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional, Union from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.attach_decorator_data_jws import ( AttachDecoratorDataJWS, diff --git a/aries_cloudcontroller/models/attach_decorator_data1_jws.py b/aries_cloudcontroller/models/attach_decorator_data1_jws.py index dbe5954f..8866693e 100644 --- a/aries_cloudcontroller/models/attach_decorator_data1_jws.py +++ b/aries_cloudcontroller/models/attach_decorator_data1_jws.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.attach_decorator_data_jws_header import ( AttachDecoratorDataJWSHeader, diff --git a/aries_cloudcontroller/models/attach_decorator_data_jws.py b/aries_cloudcontroller/models/attach_decorator_data_jws.py index 056dd5fa..09496c39 100644 --- a/aries_cloudcontroller/models/attach_decorator_data_jws.py +++ b/aries_cloudcontroller/models/attach_decorator_data_jws.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.attach_decorator_data1_jws import ( AttachDecoratorData1JWS, @@ -45,9 +44,7 @@ class AttachDecoratorDataJWS(BaseModel): protected: Optional[StrictStr] = Field( default=None, description="protected JWS header" ) - signature: Optional[StrictStr] = Field( - default=None, description="signature" - ) + signature: Optional[StrictStr] = Field(default=None, description="signature") signatures: Optional[List[AttachDecoratorData1JWS]] = Field( default=None, description="List of signatures" ) diff --git a/aries_cloudcontroller/models/attach_decorator_data_jws_header.py b/aries_cloudcontroller/models/attach_decorator_data_jws_header.py index 7a056dee..5536a283 100644 --- a/aries_cloudcontroller/models/attach_decorator_data_jws_header.py +++ b/aries_cloudcontroller/models/attach_decorator_data_jws_header.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/claim_format.py b/aries_cloudcontroller/models/claim_format.py index ae3a8e9a..3f77d5f2 100644 --- a/aries_cloudcontroller/models/claim_format.py +++ b/aries_cloudcontroller/models/claim_format.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel diff --git a/aries_cloudcontroller/models/clear_pending_revocations_request.py b/aries_cloudcontroller/models/clear_pending_revocations_request.py index c2a38cb9..0018c481 100644 --- a/aries_cloudcontroller/models/clear_pending_revocations_request.py +++ b/aries_cloudcontroller/models/clear_pending_revocations_request.py @@ -19,7 +19,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/conn_record.py b/aries_cloudcontroller/models/conn_record.py index 7e83f34e..7abcdd7b 100644 --- a/aries_cloudcontroller/models/conn_record.py +++ b/aries_cloudcontroller/models/conn_record.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/connection_invitation.py b/aries_cloudcontroller/models/connection_invitation.py index 19957b61..95cb8096 100644 --- a/aries_cloudcontroller/models/connection_invitation.py +++ b/aries_cloudcontroller/models/connection_invitation.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/connection_metadata.py b/aries_cloudcontroller/models/connection_metadata.py index 80873399..796d5133 100644 --- a/aries_cloudcontroller/models/connection_metadata.py +++ b/aries_cloudcontroller/models/connection_metadata.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field diff --git a/aries_cloudcontroller/models/connection_metadata_set_request.py b/aries_cloudcontroller/models/connection_metadata_set_request.py index b64a499e..46a01bba 100644 --- a/aries_cloudcontroller/models/connection_metadata_set_request.py +++ b/aries_cloudcontroller/models/connection_metadata_set_request.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Union +from typing import Any, ClassVar, Dict, List from pydantic import BaseModel, Field diff --git a/aries_cloudcontroller/models/connection_static_request.py b/aries_cloudcontroller/models/connection_static_request.py index abda9069..07935fe3 100644 --- a/aries_cloudcontroller/models/connection_static_request.py +++ b/aries_cloudcontroller/models/connection_static_request.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -38,15 +37,11 @@ class ConnectionStaticRequest(BaseModel): alias: Optional[StrictStr] = Field( default=None, description="Alias to assign to this connection" ) - my_did: Optional[StrictStr] = Field( - default=None, description="Local DID" - ) + my_did: Optional[StrictStr] = Field(default=None, description="Local DID") my_seed: Optional[StrictStr] = Field( default=None, description="Seed to use for the local DID" ) - their_did: Optional[StrictStr] = Field( - default=None, description="Remote DID" - ) + their_did: Optional[StrictStr] = Field(default=None, description="Remote DID") their_endpoint: Optional[StrictStr] = Field( default=None, description="URL endpoint for other party" ) diff --git a/aries_cloudcontroller/models/connection_static_result.py b/aries_cloudcontroller/models/connection_static_result.py index 123313ec..e8a90f4c 100644 --- a/aries_cloudcontroller/models/connection_static_result.py +++ b/aries_cloudcontroller/models/connection_static_result.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.conn_record import ConnRecord from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -37,17 +36,11 @@ class ConnectionStaticResult(BaseModel): """ my_did: StrictStr = Field(description="Local DID") - my_endpoint: StrictStr = Field( - description="My URL endpoint" - ) - my_verkey: StrictStr = Field( - description="My verification key" - ) + my_endpoint: StrictStr = Field(description="My URL endpoint") + my_verkey: StrictStr = Field(description="My verification key") record: ConnRecord their_did: StrictStr = Field(description="Remote DID") - their_verkey: StrictStr = Field( - description="Remote verification key" - ) + their_verkey: StrictStr = Field(description="Remote verification key") __properties: ClassVar[List[str]] = [ "my_did", "my_endpoint", diff --git a/aries_cloudcontroller/models/create_invitation_request.py b/aries_cloudcontroller/models/create_invitation_request.py index 18c879c7..ade8b745 100644 --- a/aries_cloudcontroller/models/create_invitation_request.py +++ b/aries_cloudcontroller/models/create_invitation_request.py @@ -17,10 +17,9 @@ import json import pprint import re -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/create_wallet_request.py b/aries_cloudcontroller/models/create_wallet_request.py index eafa7435..42481816 100644 --- a/aries_cloudcontroller/models/create_wallet_request.py +++ b/aries_cloudcontroller/models/create_wallet_request.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator diff --git a/aries_cloudcontroller/models/create_wallet_response.py b/aries_cloudcontroller/models/create_wallet_response.py index 92803acb..75120c2f 100644 --- a/aries_cloudcontroller/models/create_wallet_response.py +++ b/aries_cloudcontroller/models/create_wallet_response.py @@ -17,10 +17,9 @@ import json import pprint import re -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/cred_def_value_primary.py b/aries_cloudcontroller/models/cred_def_value_primary.py index 465ab43a..1e8b8b57 100644 --- a/aries_cloudcontroller/models/cred_def_value_primary.py +++ b/aries_cloudcontroller/models/cred_def_value_primary.py @@ -19,8 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated +from pydantic import BaseModel, field_validator from aries_cloudcontroller.models.generated import Generated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/cred_rev_indy_records_result.py b/aries_cloudcontroller/models/cred_rev_indy_records_result.py index 1982bb3a..7ac45d00 100644 --- a/aries_cloudcontroller/models/cred_rev_indy_records_result.py +++ b/aries_cloudcontroller/models/cred_rev_indy_records_result.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field diff --git a/aries_cloudcontroller/models/credential.py b/aries_cloudcontroller/models/credential.py index cbae4cb5..bb4ae61e 100644 --- a/aries_cloudcontroller/models/credential.py +++ b/aries_cloudcontroller/models/credential.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional, Union from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.linked_data_proof import LinkedDataProof from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/credential_definition.py b/aries_cloudcontroller/models/credential_definition.py index 4684b49f..e15c796e 100644 --- a/aries_cloudcontroller/models/credential_definition.py +++ b/aries_cloudcontroller/models/credential_definition.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Literal, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.cred_def_value import CredDefValue from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -51,9 +50,7 @@ class CredentialDefinition(BaseModel): default=None, description="Signature type: CL for Camenisch-Lysyanskaya" ) value: Optional[CredDefValue] = None - ver: Optional[StrictStr] = Field( - default=None, description="Node protocol version" - ) + ver: Optional[StrictStr] = Field(default=None, description="Node protocol version") __properties: ClassVar[List[str]] = [ "id", "schemaId", diff --git a/aries_cloudcontroller/models/credential_definition_send_result.py b/aries_cloudcontroller/models/credential_definition_send_result.py index de1a6455..7a347248 100644 --- a/aries_cloudcontroller/models/credential_definition_send_result.py +++ b/aries_cloudcontroller/models/credential_definition_send_result.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/credential_definitions_created_result.py b/aries_cloudcontroller/models/credential_definitions_created_result.py index efafcc1d..dfa20289 100644 --- a/aries_cloudcontroller/models/credential_definitions_created_result.py +++ b/aries_cloudcontroller/models/credential_definitions_created_result.py @@ -18,8 +18,7 @@ import pprint from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field -from typing_extensions import Annotated +from pydantic import BaseModel from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/credential_proposal.py b/aries_cloudcontroller/models/credential_proposal.py index 31e202fe..85089021 100644 --- a/aries_cloudcontroller/models/credential_proposal.py +++ b/aries_cloudcontroller/models/credential_proposal.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.credential_preview import CredentialPreview from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/did.py b/aries_cloudcontroller/models/did.py index 9a0be6cb..e007c686 100644 --- a/aries_cloudcontroller/models/did.py +++ b/aries_cloudcontroller/models/did.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Literal, Optional from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG from aries_cloudcontroller.util.regex_patterns import BBS_PATTERN, ED25519_PATTERN @@ -36,9 +35,7 @@ class DID(BaseModel): DID """ - did: Optional[StrictStr] = Field( - default=None, description="DID of interest" - ) + did: Optional[StrictStr] = Field(default=None, description="DID of interest") key_type: Optional[Literal["ed25519", "bls12381g2"]] = Field( default=None, description="Key type associated with the DID" ) diff --git a/aries_cloudcontroller/models/did_create_options.py b/aries_cloudcontroller/models/did_create_options.py index afa36da6..87a7f98a 100644 --- a/aries_cloudcontroller/models/did_create_options.py +++ b/aries_cloudcontroller/models/did_create_options.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/did_endpoint.py b/aries_cloudcontroller/models/did_endpoint.py index 1c9093d1..d63e9dda 100644 --- a/aries_cloudcontroller/models/did_endpoint.py +++ b/aries_cloudcontroller/models/did_endpoint.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/did_endpoint_with_type.py b/aries_cloudcontroller/models/did_endpoint_with_type.py index ad2f5ba3..63005f1b 100644 --- a/aries_cloudcontroller/models/did_endpoint_with_type.py +++ b/aries_cloudcontroller/models/did_endpoint_with_type.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/didx_request.py b/aries_cloudcontroller/models/didx_request.py index 56824592..a3f6a627 100644 --- a/aries_cloudcontroller/models/didx_request.py +++ b/aries_cloudcontroller/models/didx_request.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.attach_decorator import AttachDecorator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -42,9 +41,7 @@ class DIDXRequest(BaseModel): type: Optional[StrictStr] = Field( default=None, description="Message type", alias="@type" ) - did: Optional[StrictStr] = Field( - default=None, description="DID of exchange" - ) + did: Optional[StrictStr] = Field(default=None, description="DID of exchange") did_docattach: Optional[AttachDecorator] = Field( default=None, alias="did_doc~attach" ) diff --git a/aries_cloudcontroller/models/dif_holder.py b/aries_cloudcontroller/models/dif_holder.py index f2a4eaec..ad89a555 100644 --- a/aries_cloudcontroller/models/dif_holder.py +++ b/aries_cloudcontroller/models/dif_holder.py @@ -19,7 +19,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/dif_options.py b/aries_cloudcontroller/models/dif_options.py index e80aeb75..f8953cec 100644 --- a/aries_cloudcontroller/models/dif_options.py +++ b/aries_cloudcontroller/models/dif_options.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/dif_pres_spec.py b/aries_cloudcontroller/models/dif_pres_spec.py index 1d084cbe..3895ea9f 100644 --- a/aries_cloudcontroller/models/dif_pres_spec.py +++ b/aries_cloudcontroller/models/dif_pres_spec.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr diff --git a/aries_cloudcontroller/models/disclosures.py b/aries_cloudcontroller/models/disclosures.py index d0329841..13b44218 100644 --- a/aries_cloudcontroller/models/disclosures.py +++ b/aries_cloudcontroller/models/disclosures.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr diff --git a/aries_cloudcontroller/models/doc.py b/aries_cloudcontroller/models/doc.py index 2dd376b3..31c0d350 100644 --- a/aries_cloudcontroller/models/doc.py +++ b/aries_cloudcontroller/models/doc.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Union +from typing import Any, ClassVar, Dict, List from pydantic import BaseModel, Field diff --git a/aries_cloudcontroller/models/endpoints_result.py b/aries_cloudcontroller/models/endpoints_result.py index d2714f1c..73f90b75 100644 --- a/aries_cloudcontroller/models/endpoints_result.py +++ b/aries_cloudcontroller/models/endpoints_result.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -35,9 +34,7 @@ class EndpointsResult(BaseModel): EndpointsResult """ - my_endpoint: Optional[StrictStr] = Field( - default=None, description="My endpoint" - ) + my_endpoint: Optional[StrictStr] = Field(default=None, description="My endpoint") their_endpoint: Optional[StrictStr] = Field( default=None, description="Their endpoint" ) diff --git a/aries_cloudcontroller/models/generated.py b/aries_cloudcontroller/models/generated.py index bd3647a4..d81567b5 100644 --- a/aries_cloudcontroller/models/generated.py +++ b/aries_cloudcontroller/models/generated.py @@ -19,8 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated +from pydantic import BaseModel, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/get_did_endpoint_response.py b/aries_cloudcontroller/models/get_did_endpoint_response.py index 2dc6f086..774dec3a 100644 --- a/aries_cloudcontroller/models/get_did_endpoint_response.py +++ b/aries_cloudcontroller/models/get_did_endpoint_response.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/get_did_verkey_response.py b/aries_cloudcontroller/models/get_did_verkey_response.py index 6e84f94d..1ef5781f 100644 --- a/aries_cloudcontroller/models/get_did_verkey_response.py +++ b/aries_cloudcontroller/models/get_did_verkey_response.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_attr_value.py b/aries_cloudcontroller/models/indy_attr_value.py index fd25fb01..ae5dced3 100644 --- a/aries_cloudcontroller/models/indy_attr_value.py +++ b/aries_cloudcontroller/models/indy_attr_value.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -35,9 +34,7 @@ class IndyAttrValue(BaseModel): IndyAttrValue """ - encoded: StrictStr = Field( - description="Attribute encoded value" - ) + encoded: StrictStr = Field(description="Attribute encoded value") raw: StrictStr = Field(description="Attribute raw value") __properties: ClassVar[List[str]] = ["encoded", "raw"] diff --git a/aries_cloudcontroller/models/indy_cred_abstract.py b/aries_cloudcontroller/models/indy_cred_abstract.py index c67eea54..ee4f49e1 100644 --- a/aries_cloudcontroller/models/indy_cred_abstract.py +++ b/aries_cloudcontroller/models/indy_cred_abstract.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.indy_key_correctness_proof import ( IndyKeyCorrectnessProof, @@ -38,16 +37,10 @@ class IndyCredAbstract(BaseModel): IndyCredAbstract """ - cred_def_id: StrictStr = Field( - description="Credential definition identifier" - ) + cred_def_id: StrictStr = Field(description="Credential definition identifier") key_correctness_proof: IndyKeyCorrectnessProof - nonce: StrictStr = Field( - description="Nonce in credential abstract" - ) - schema_id: StrictStr = Field( - description="Schema identifier" - ) + nonce: StrictStr = Field(description="Nonce in credential abstract") + schema_id: StrictStr = Field(description="Schema identifier") __properties: ClassVar[List[str]] = [ "cred_def_id", "key_correctness_proof", diff --git a/aries_cloudcontroller/models/indy_cred_info.py b/aries_cloudcontroller/models/indy_cred_info.py index 170a08e3..0eb18424 100644 --- a/aries_cloudcontroller/models/indy_cred_info.py +++ b/aries_cloudcontroller/models/indy_cred_info.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_cred_request.py b/aries_cloudcontroller/models/indy_cred_request.py index 30f2774d..b681b75b 100644 --- a/aries_cloudcontroller/models/indy_cred_request.py +++ b/aries_cloudcontroller/models/indy_cred_request.py @@ -17,10 +17,9 @@ import json import pprint import re -from typing import Any, ClassVar, Dict, List, Union +from typing import Any, ClassVar, Dict, List from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -39,12 +38,8 @@ class IndyCredRequest(BaseModel): blinded_ms_correctness_proof: Dict[str, Any] = Field( description="Blinded master secret correctness proof" ) - cred_def_id: StrictStr = Field( - description="Credential definition identifier" - ) - nonce: StrictStr = Field( - description="Nonce in credential request" - ) + cred_def_id: StrictStr = Field(description="Credential definition identifier") + nonce: StrictStr = Field(description="Nonce in credential request") prover_did: StrictStr = Field(description="Prover DID") __properties: ClassVar[List[str]] = [ "blinded_ms", diff --git a/aries_cloudcontroller/models/indy_credential.py b/aries_cloudcontroller/models/indy_credential.py index 618ea314..61939e36 100644 --- a/aries_cloudcontroller/models/indy_credential.py +++ b/aries_cloudcontroller/models/indy_credential.py @@ -17,10 +17,9 @@ import json import pprint import re -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.indy_attr_value import IndyAttrValue from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -36,18 +35,14 @@ class IndyCredential(BaseModel): IndyCredential """ - cred_def_id: StrictStr = Field( - description="Credential definition identifier" - ) + cred_def_id: StrictStr = Field(description="Credential definition identifier") rev_reg: Optional[Dict[str, Any]] = Field( default=None, description="Revocation registry state" ) rev_reg_id: Optional[StrictStr] = Field( default=None, description="Revocation registry identifier" ) - schema_id: StrictStr = Field( - description="Schema identifier" - ) + schema_id: StrictStr = Field(description="Schema identifier") signature: Dict[str, Any] = Field(description="Credential signature") signature_correctness_proof: Dict[str, Any] = Field( description="Credential signature correctness proof" diff --git a/aries_cloudcontroller/models/indy_eq_proof.py b/aries_cloudcontroller/models/indy_eq_proof.py index 0d2d0903..1fc0044a 100644 --- a/aries_cloudcontroller/models/indy_eq_proof.py +++ b/aries_cloudcontroller/models/indy_eq_proof.py @@ -19,8 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated +from pydantic import BaseModel, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_ge_proof.py b/aries_cloudcontroller/models/indy_ge_proof.py index 31d96efc..444e6687 100644 --- a/aries_cloudcontroller/models/indy_ge_proof.py +++ b/aries_cloudcontroller/models/indy_ge_proof.py @@ -19,8 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated +from pydantic import BaseModel, field_validator from aries_cloudcontroller.models.indy_ge_proof_pred import IndyGEProofPred from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_key_correctness_proof.py b/aries_cloudcontroller/models/indy_key_correctness_proof.py index 26f53b91..635f3e90 100644 --- a/aries_cloudcontroller/models/indy_key_correctness_proof.py +++ b/aries_cloudcontroller/models/indy_key_correctness_proof.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -35,13 +34,9 @@ class IndyKeyCorrectnessProof(BaseModel): IndyKeyCorrectnessProof """ - c: StrictStr = Field( - description="c in key correctness proof" - ) + c: StrictStr = Field(description="c in key correctness proof") xr_cap: List[List[StrictStr]] = Field(description="xr_cap in key correctness proof") - xz_cap: StrictStr = Field( - description="xz_cap in key correctness proof" - ) + xz_cap: StrictStr = Field(description="xz_cap in key correctness proof") __properties: ClassVar[List[str]] = ["c", "xr_cap", "xz_cap"] @field_validator("c") diff --git a/aries_cloudcontroller/models/indy_pres_attr_spec.py b/aries_cloudcontroller/models/indy_pres_attr_spec.py index 305b16b5..8785b78c 100644 --- a/aries_cloudcontroller/models/indy_pres_attr_spec.py +++ b/aries_cloudcontroller/models/indy_pres_attr_spec.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_pres_pred_spec.py b/aries_cloudcontroller/models/indy_pres_pred_spec.py index f2f76567..a5b141b0 100644 --- a/aries_cloudcontroller/models/indy_pres_pred_spec.py +++ b/aries_cloudcontroller/models/indy_pres_pred_spec.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictInt, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_primary_proof_eq_proof.py b/aries_cloudcontroller/models/indy_primary_proof_eq_proof.py index 6866c556..b7a94bd4 100644 --- a/aries_cloudcontroller/models/indy_primary_proof_eq_proof.py +++ b/aries_cloudcontroller/models/indy_primary_proof_eq_proof.py @@ -19,8 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated +from pydantic import BaseModel, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_proof_request.py b/aries_cloudcontroller/models/indy_proof_request.py index 85186181..8f0adbba 100644 --- a/aries_cloudcontroller/models/indy_proof_request.py +++ b/aries_cloudcontroller/models/indy_proof_request.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.indy_proof_req_attr_spec import IndyProofReqAttrSpec from aries_cloudcontroller.models.indy_proof_req_pred_spec import IndyProofReqPredSpec @@ -42,9 +41,7 @@ class IndyProofRequest(BaseModel): name: Optional[StrictStr] = Field(default=None, description="Proof request name") non_revoked: Optional[IndyProofRequestNonRevoked] = None - nonce: Optional[StrictStr] = Field( - default=None, description="Nonce" - ) + nonce: Optional[StrictStr] = Field(default=None, description="Nonce") requested_attributes: Dict[str, IndyProofReqAttrSpec] = Field( description="Requested attribute specifications of proof request" ) diff --git a/aries_cloudcontroller/models/indy_proof_requested_proof.py b/aries_cloudcontroller/models/indy_proof_requested_proof.py index cc32d77b..bb98e9d6 100644 --- a/aries_cloudcontroller/models/indy_proof_requested_proof.py +++ b/aries_cloudcontroller/models/indy_proof_requested_proof.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field diff --git a/aries_cloudcontroller/models/indy_proof_requested_proof_revealed_attr.py b/aries_cloudcontroller/models/indy_proof_requested_proof_revealed_attr.py index dc47fff0..6e9945e9 100644 --- a/aries_cloudcontroller/models/indy_proof_requested_proof_revealed_attr.py +++ b/aries_cloudcontroller/models/indy_proof_requested_proof_revealed_attr.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictInt, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -35,9 +34,7 @@ class IndyProofRequestedProofRevealedAttr(BaseModel): IndyProofRequestedProofRevealedAttr """ - encoded: Optional[StrictStr] = Field( - default=None, description="Encoded value" - ) + encoded: Optional[StrictStr] = Field(default=None, description="Encoded value") raw: Optional[StrictStr] = Field(default=None, description="Raw value") sub_proof_index: Optional[StrictInt] = Field( default=None, description="Sub-proof index" diff --git a/aries_cloudcontroller/models/indy_rev_reg_def.py b/aries_cloudcontroller/models/indy_rev_reg_def.py index 6e997691..19862a6d 100644 --- a/aries_cloudcontroller/models/indy_rev_reg_def.py +++ b/aries_cloudcontroller/models/indy_rev_reg_def.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.indy_rev_reg_def_value import IndyRevRegDefValue from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_rev_reg_entry.py b/aries_cloudcontroller/models/indy_rev_reg_entry.py index 652096b2..3e4bf1c0 100644 --- a/aries_cloudcontroller/models/indy_rev_reg_entry.py +++ b/aries_cloudcontroller/models/indy_rev_reg_entry.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.indy_rev_reg_entry_value import IndyRevRegEntryValue from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/input_descriptors.py b/aries_cloudcontroller/models/input_descriptors.py index 64bfedde..90627486 100644 --- a/aries_cloudcontroller/models/input_descriptors.py +++ b/aries_cloudcontroller/models/input_descriptors.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr diff --git a/aries_cloudcontroller/models/invitation_create_request.py b/aries_cloudcontroller/models/invitation_create_request.py index 16b1b332..8a453631 100644 --- a/aries_cloudcontroller/models/invitation_create_request.py +++ b/aries_cloudcontroller/models/invitation_create_request.py @@ -17,10 +17,9 @@ import json import pprint import re -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.attachment_def import AttachmentDef from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/invitation_record.py b/aries_cloudcontroller/models/invitation_record.py index 867434bd..cfe27e04 100644 --- a/aries_cloudcontroller/models/invitation_record.py +++ b/aries_cloudcontroller/models/invitation_record.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.invitation_message import InvitationMessage from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/issuer_cred_rev_record.py b/aries_cloudcontroller/models/issuer_cred_rev_record.py index 79d72905..ea03b403 100644 --- a/aries_cloudcontroller/models/issuer_cred_rev_record.py +++ b/aries_cloudcontroller/models/issuer_cred_rev_record.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/issuer_rev_reg_record.py b/aries_cloudcontroller/models/issuer_rev_reg_record.py index 89089e25..61b50baf 100644 --- a/aries_cloudcontroller/models/issuer_rev_reg_record.py +++ b/aries_cloudcontroller/models/issuer_rev_reg_record.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictInt, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.indy_rev_reg_def import IndyRevRegDef from aries_cloudcontroller.models.indy_rev_reg_entry import IndyRevRegEntry @@ -44,9 +43,7 @@ class IssuerRevRegRecord(BaseModel): default=None, description="Credential definition identifier" ) error_msg: Optional[StrictStr] = Field(default=None, description="Error message") - issuer_did: Optional[StrictStr] = Field( - default=None, description="Issuer DID" - ) + issuer_did: Optional[StrictStr] = Field(default=None, description="Issuer DID") max_cred_num: Optional[StrictInt] = Field( default=None, description="Maximum number of credentials for revocation registry", @@ -72,9 +69,7 @@ class IssuerRevRegRecord(BaseModel): tag: Optional[StrictStr] = Field( default=None, description="Tag within issuer revocation registry identifier" ) - tails_hash: Optional[StrictStr] = Field( - default=None, description="Tails hash" - ) + tails_hash: Optional[StrictStr] = Field(default=None, description="Tails hash") tails_local_path: Optional[StrictStr] = Field( default=None, description="Local path to tails file" ) diff --git a/aries_cloudcontroller/models/jws_create.py b/aries_cloudcontroller/models/jws_create.py index 119ddd84..baf4ad4f 100644 --- a/aries_cloudcontroller/models/jws_create.py +++ b/aries_cloudcontroller/models/jws_create.py @@ -17,10 +17,9 @@ import json import pprint import re -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -35,9 +34,7 @@ class JWSCreate(BaseModel): JWSCreate """ - did: Optional[StrictStr] = Field( - default=None, description="DID of interest" - ) + did: Optional[StrictStr] = Field(default=None, description="DID of interest") headers: Optional[Dict[str, Any]] = None payload: Dict[str, Any] verification_method: Optional[StrictStr] = Field( diff --git a/aries_cloudcontroller/models/jws_verify.py b/aries_cloudcontroller/models/jws_verify.py index 95cc185f..ccfd124d 100644 --- a/aries_cloudcontroller/models/jws_verify.py +++ b/aries_cloudcontroller/models/jws_verify.py @@ -19,8 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated +from pydantic import BaseModel, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/jws_verify_response.py b/aries_cloudcontroller/models/jws_verify_response.py index b7cc4b4e..850c5dcc 100644 --- a/aries_cloudcontroller/models/jws_verify_response.py +++ b/aries_cloudcontroller/models/jws_verify_response.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr diff --git a/aries_cloudcontroller/models/keylist_query.py b/aries_cloudcontroller/models/keylist_query.py index 528765e0..4abc4306 100644 --- a/aries_cloudcontroller/models/keylist_query.py +++ b/aries_cloudcontroller/models/keylist_query.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr diff --git a/aries_cloudcontroller/models/keylist_query_filter_request.py b/aries_cloudcontroller/models/keylist_query_filter_request.py index 24c2a4e0..300133ad 100644 --- a/aries_cloudcontroller/models/keylist_query_filter_request.py +++ b/aries_cloudcontroller/models/keylist_query_filter_request.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field diff --git a/aries_cloudcontroller/models/keylist_update_rule.py b/aries_cloudcontroller/models/keylist_update_rule.py index b2b35eca..8e9c9650 100644 --- a/aries_cloudcontroller/models/keylist_update_rule.py +++ b/aries_cloudcontroller/models/keylist_update_rule.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -36,9 +35,7 @@ class KeylistUpdateRule(BaseModel): """ action: StrictStr = Field(description="Action for specific key") - recipient_key: StrictStr = Field( - description="Key to remove or add" - ) + recipient_key: StrictStr = Field(description="Key to remove or add") __properties: ClassVar[List[str]] = ["action", "recipient_key"] @field_validator("action") diff --git a/aries_cloudcontroller/models/ld_proof_vc_detail_options.py b/aries_cloudcontroller/models/ld_proof_vc_detail_options.py index 3efad5ee..867d40e1 100644 --- a/aries_cloudcontroller/models/ld_proof_vc_detail_options.py +++ b/aries_cloudcontroller/models/ld_proof_vc_detail_options.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.credential_status_options import ( CredentialStatusOptions, diff --git a/aries_cloudcontroller/models/linked_data_proof.py b/aries_cloudcontroller/models/linked_data_proof.py index 69e6241b..7e771884 100644 --- a/aries_cloudcontroller/models/linked_data_proof.py +++ b/aries_cloudcontroller/models/linked_data_proof.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/mediation_record.py b/aries_cloudcontroller/models/mediation_record.py index e315ee8e..ebc3cd25 100644 --- a/aries_cloudcontroller/models/mediation_record.py +++ b/aries_cloudcontroller/models/mediation_record.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/model_schema.py b/aries_cloudcontroller/models/model_schema.py index 84d3d9be..ba6e2bba 100644 --- a/aries_cloudcontroller/models/model_schema.py +++ b/aries_cloudcontroller/models/model_schema.py @@ -38,19 +38,13 @@ class ModelSchema(BaseModel): attr_names: Optional[List[StrictStr]] = Field( default=None, description="Schema attribute names", alias="attrNames" ) - id: Optional[StrictStr] = Field( - default=None, description="Schema identifier" - ) + id: Optional[StrictStr] = Field(default=None, description="Schema identifier") name: Optional[StrictStr] = Field(default=None, description="Schema name") seq_no: Optional[Annotated[int, Field(strict=True, ge=1)]] = Field( default=None, description="Schema sequence number", alias="seqNo" ) - ver: Optional[StrictStr] = Field( - default=None, description="Node protocol version" - ) - version: Optional[StrictStr] = Field( - default=None, description="Schema version" - ) + ver: Optional[StrictStr] = Field(default=None, description="Node protocol version") + version: Optional[StrictStr] = Field(default=None, description="Schema version") __properties: ClassVar[List[str]] = [ "attrNames", "id", diff --git a/aries_cloudcontroller/models/oob_record.py b/aries_cloudcontroller/models/oob_record.py index 9759cb6c..702d8755 100644 --- a/aries_cloudcontroller/models/oob_record.py +++ b/aries_cloudcontroller/models/oob_record.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.invitation_message import InvitationMessage from aries_cloudcontroller.models.service_decorator import ServiceDecorator diff --git a/aries_cloudcontroller/models/presentation_definition.py b/aries_cloudcontroller/models/presentation_definition.py index 5252728d..f451c70f 100644 --- a/aries_cloudcontroller/models/presentation_definition.py +++ b/aries_cloudcontroller/models/presentation_definition.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.claim_format import ClaimFormat from aries_cloudcontroller.models.input_descriptors import InputDescriptors diff --git a/aries_cloudcontroller/models/profile_settings.py b/aries_cloudcontroller/models/profile_settings.py index 9de23f3c..fb7f2528 100644 --- a/aries_cloudcontroller/models/profile_settings.py +++ b/aries_cloudcontroller/models/profile_settings.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field diff --git a/aries_cloudcontroller/models/publish_revocations.py b/aries_cloudcontroller/models/publish_revocations.py index e23db994..399ab20c 100644 --- a/aries_cloudcontroller/models/publish_revocations.py +++ b/aries_cloudcontroller/models/publish_revocations.py @@ -19,7 +19,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/raw_encoded.py b/aries_cloudcontroller/models/raw_encoded.py index a1d6c584..8f4841c9 100644 --- a/aries_cloudcontroller/models/raw_encoded.py +++ b/aries_cloudcontroller/models/raw_encoded.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -35,9 +34,7 @@ class RawEncoded(BaseModel): RawEncoded """ - encoded: Optional[StrictStr] = Field( - default=None, description="Encoded value" - ) + encoded: Optional[StrictStr] = Field(default=None, description="Encoded value") raw: Optional[StrictStr] = Field(default=None, description="Raw value") __properties: ClassVar[List[str]] = ["encoded", "raw"] diff --git a/aries_cloudcontroller/models/receive_invitation_request.py b/aries_cloudcontroller/models/receive_invitation_request.py index d6c9aca9..28f48ce4 100644 --- a/aries_cloudcontroller/models/receive_invitation_request.py +++ b/aries_cloudcontroller/models/receive_invitation_request.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/resolution_result.py b/aries_cloudcontroller/models/resolution_result.py index c95270e5..d0360682 100644 --- a/aries_cloudcontroller/models/resolution_result.py +++ b/aries_cloudcontroller/models/resolution_result.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Union +from typing import Any, ClassVar, Dict, List from pydantic import BaseModel, Field diff --git a/aries_cloudcontroller/models/rev_reg_wallet_updated_result.py b/aries_cloudcontroller/models/rev_reg_wallet_updated_result.py index 65a3d816..49d0b90e 100644 --- a/aries_cloudcontroller/models/rev_reg_wallet_updated_result.py +++ b/aries_cloudcontroller/models/rev_reg_wallet_updated_result.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field diff --git a/aries_cloudcontroller/models/rev_regs_created.py b/aries_cloudcontroller/models/rev_regs_created.py index 066c1cd4..cad3d76b 100644 --- a/aries_cloudcontroller/models/rev_regs_created.py +++ b/aries_cloudcontroller/models/rev_regs_created.py @@ -18,8 +18,7 @@ import pprint from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field -from typing_extensions import Annotated +from pydantic import BaseModel from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/revoke_request.py b/aries_cloudcontroller/models/revoke_request.py index d7e5a7f7..053627df 100644 --- a/aries_cloudcontroller/models/revoke_request.py +++ b/aries_cloudcontroller/models/revoke_request.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/route_record.py b/aries_cloudcontroller/models/route_record.py index 6c8db9eb..a099cde5 100644 --- a/aries_cloudcontroller/models/route_record.py +++ b/aries_cloudcontroller/models/route_record.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/schema_send_request.py b/aries_cloudcontroller/models/schema_send_request.py index bc90ff3d..f77237ac 100644 --- a/aries_cloudcontroller/models/schema_send_request.py +++ b/aries_cloudcontroller/models/schema_send_request.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -37,9 +36,7 @@ class SchemaSendRequest(BaseModel): attributes: List[StrictStr] = Field(description="List of schema attributes") schema_name: StrictStr = Field(description="Schema name") - schema_version: StrictStr = Field( - description="Schema version" - ) + schema_version: StrictStr = Field(description="Schema version") __properties: ClassVar[List[str]] = ["attributes", "schema_name", "schema_version"] @field_validator("schema_version") diff --git a/aries_cloudcontroller/models/schema_send_result.py b/aries_cloudcontroller/models/schema_send_result.py index d42d783a..5c689b20 100644 --- a/aries_cloudcontroller/models/schema_send_result.py +++ b/aries_cloudcontroller/models/schema_send_result.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.model_schema import ModelSchema from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -37,9 +36,7 @@ class SchemaSendResult(BaseModel): """ var_schema: Optional[ModelSchema] = Field(default=None, alias="schema") - schema_id: StrictStr = Field( - description="Schema identifier" - ) + schema_id: StrictStr = Field(description="Schema identifier") __properties: ClassVar[List[str]] = ["schema", "schema_id"] @field_validator("schema_id") diff --git a/aries_cloudcontroller/models/schemas_created_result.py b/aries_cloudcontroller/models/schemas_created_result.py index f4df23db..4179acef 100644 --- a/aries_cloudcontroller/models/schemas_created_result.py +++ b/aries_cloudcontroller/models/schemas_created_result.py @@ -18,8 +18,7 @@ import pprint from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field -from typing_extensions import Annotated +from pydantic import BaseModel from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/service_decorator.py b/aries_cloudcontroller/models/service_decorator.py index 168a89d1..a500b8b6 100644 --- a/aries_cloudcontroller/models/service_decorator.py +++ b/aries_cloudcontroller/models/service_decorator.py @@ -19,7 +19,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/sign_response.py b/aries_cloudcontroller/models/sign_response.py index 8ef2c364..5e12428a 100644 --- a/aries_cloudcontroller/models/sign_response.py +++ b/aries_cloudcontroller/models/sign_response.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr diff --git a/aries_cloudcontroller/models/transaction_record.py b/aries_cloudcontroller/models/transaction_record.py index b9deb184..057283e6 100644 --- a/aries_cloudcontroller/models/transaction_record.py +++ b/aries_cloudcontroller/models/transaction_record.py @@ -17,10 +17,9 @@ import json import pprint import re -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/update_profile_settings.py b/aries_cloudcontroller/models/update_profile_settings.py index 761ed345..183cb9f1 100644 --- a/aries_cloudcontroller/models/update_profile_settings.py +++ b/aries_cloudcontroller/models/update_profile_settings.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field diff --git a/aries_cloudcontroller/models/update_wallet_request.py b/aries_cloudcontroller/models/update_wallet_request.py index 9655d623..b91b7b84 100644 --- a/aries_cloudcontroller/models/update_wallet_request.py +++ b/aries_cloudcontroller/models/update_wallet_request.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator diff --git a/aries_cloudcontroller/models/v10_credential_conn_free_offer_request.py b/aries_cloudcontroller/models/v10_credential_conn_free_offer_request.py index 65cfa355..39e698bb 100644 --- a/aries_cloudcontroller/models/v10_credential_conn_free_offer_request.py +++ b/aries_cloudcontroller/models/v10_credential_conn_free_offer_request.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.credential_preview import CredentialPreview from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -47,9 +46,7 @@ class V10CredentialConnFreeOfferRequest(BaseModel): comment: Optional[StrictStr] = Field( default=None, description="Human-readable comment" ) - cred_def_id: StrictStr = Field( - description="Credential definition identifier" - ) + cred_def_id: StrictStr = Field(description="Credential definition identifier") credential_preview: CredentialPreview trace: Optional[StrictBool] = Field( default=None, diff --git a/aries_cloudcontroller/models/v10_credential_create.py b/aries_cloudcontroller/models/v10_credential_create.py index 95057dbe..3c1d164a 100644 --- a/aries_cloudcontroller/models/v10_credential_create.py +++ b/aries_cloudcontroller/models/v10_credential_create.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.credential_preview import CredentialPreview from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/v10_credential_exchange.py b/aries_cloudcontroller/models/v10_credential_exchange.py index 020b1baf..c8783e8c 100644 --- a/aries_cloudcontroller/models/v10_credential_exchange.py +++ b/aries_cloudcontroller/models/v10_credential_exchange.py @@ -17,10 +17,9 @@ import json import pprint import re -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.credential_offer import CredentialOffer from aries_cloudcontroller.models.credential_proposal import CredentialProposal diff --git a/aries_cloudcontroller/models/v10_credential_free_offer_request.py b/aries_cloudcontroller/models/v10_credential_free_offer_request.py index ec153e11..351d4852 100644 --- a/aries_cloudcontroller/models/v10_credential_free_offer_request.py +++ b/aries_cloudcontroller/models/v10_credential_free_offer_request.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.credential_preview import CredentialPreview from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG @@ -48,9 +47,7 @@ class V10CredentialFreeOfferRequest(BaseModel): default=None, description="Human-readable comment" ) connection_id: StrictStr = Field(description="Connection identifier") - cred_def_id: StrictStr = Field( - description="Credential definition identifier" - ) + cred_def_id: StrictStr = Field(description="Credential definition identifier") credential_preview: CredentialPreview trace: Optional[StrictBool] = Field( default=None, diff --git a/aries_cloudcontroller/models/v10_credential_proposal_request_mand.py b/aries_cloudcontroller/models/v10_credential_proposal_request_mand.py index 1ddbbfd4..b8a41692 100644 --- a/aries_cloudcontroller/models/v10_credential_proposal_request_mand.py +++ b/aries_cloudcontroller/models/v10_credential_proposal_request_mand.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.credential_preview import CredentialPreview from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/v10_credential_proposal_request_opt.py b/aries_cloudcontroller/models/v10_credential_proposal_request_opt.py index 71cf79dc..cf3b80c2 100644 --- a/aries_cloudcontroller/models/v10_credential_proposal_request_opt.py +++ b/aries_cloudcontroller/models/v10_credential_proposal_request_opt.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.credential_preview import CredentialPreview from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/v10_discovery_record.py b/aries_cloudcontroller/models/v10_discovery_record.py index 33f0a27b..681b46e2 100644 --- a/aries_cloudcontroller/models/v10_discovery_record.py +++ b/aries_cloudcontroller/models/v10_discovery_record.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.disclose import Disclose from aries_cloudcontroller.models.query import Query diff --git a/aries_cloudcontroller/models/v10_presentation_exchange.py b/aries_cloudcontroller/models/v10_presentation_exchange.py index b604d67c..f478ae21 100644 --- a/aries_cloudcontroller/models/v10_presentation_exchange.py +++ b/aries_cloudcontroller/models/v10_presentation_exchange.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.indy_proof import IndyProof from aries_cloudcontroller.models.indy_proof_request import IndyProofRequest diff --git a/aries_cloudcontroller/models/v20_cred_ex_record.py b/aries_cloudcontroller/models/v20_cred_ex_record.py index 6d57c05e..5c0e8704 100644 --- a/aries_cloudcontroller/models/v20_cred_ex_record.py +++ b/aries_cloudcontroller/models/v20_cred_ex_record.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.v20_cred_ex_record_by_format import ( V20CredExRecordByFormat, diff --git a/aries_cloudcontroller/models/v20_cred_ex_record_by_format.py b/aries_cloudcontroller/models/v20_cred_ex_record_by_format.py index 5459ebb1..6d5c5ac1 100644 --- a/aries_cloudcontroller/models/v20_cred_ex_record_by_format.py +++ b/aries_cloudcontroller/models/v20_cred_ex_record_by_format.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel diff --git a/aries_cloudcontroller/models/v20_cred_ex_record_indy.py b/aries_cloudcontroller/models/v20_cred_ex_record_indy.py index 488a0f47..ba9e6d18 100644 --- a/aries_cloudcontroller/models/v20_cred_ex_record_indy.py +++ b/aries_cloudcontroller/models/v20_cred_ex_record_indy.py @@ -17,10 +17,9 @@ import json import pprint import re -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/v20_cred_ex_record_ld_proof.py b/aries_cloudcontroller/models/v20_cred_ex_record_ld_proof.py index a8ec3a3e..756f464f 100644 --- a/aries_cloudcontroller/models/v20_cred_ex_record_ld_proof.py +++ b/aries_cloudcontroller/models/v20_cred_ex_record_ld_proof.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/v20_cred_filter_indy.py b/aries_cloudcontroller/models/v20_cred_filter_indy.py index 7114f3ae..40825a02 100644 --- a/aries_cloudcontroller/models/v20_cred_filter_indy.py +++ b/aries_cloudcontroller/models/v20_cred_filter_indy.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/v20_discovery_record.py b/aries_cloudcontroller/models/v20_discovery_record.py index c0ba4aa8..30049b1e 100644 --- a/aries_cloudcontroller/models/v20_discovery_record.py +++ b/aries_cloudcontroller/models/v20_discovery_record.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.disclosures import Disclosures from aries_cloudcontroller.models.queries import Queries diff --git a/aries_cloudcontroller/models/v20_pres_ex_record.py b/aries_cloudcontroller/models/v20_pres_ex_record.py index 0229b213..47784238 100644 --- a/aries_cloudcontroller/models/v20_pres_ex_record.py +++ b/aries_cloudcontroller/models/v20_pres_ex_record.py @@ -20,7 +20,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictBool, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.models.v20_pres import V20Pres from aries_cloudcontroller.models.v20_pres_ex_record_by_format import ( diff --git a/aries_cloudcontroller/models/v20_pres_ex_record_by_format.py b/aries_cloudcontroller/models/v20_pres_ex_record_by_format.py index 4480f3c5..88dd5b2a 100644 --- a/aries_cloudcontroller/models/v20_pres_ex_record_by_format.py +++ b/aries_cloudcontroller/models/v20_pres_ex_record_by_format.py @@ -16,7 +16,7 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel diff --git a/aries_cloudcontroller/models/vc_record.py b/aries_cloudcontroller/models/vc_record.py index f28462d0..1518bd81 100644 --- a/aries_cloudcontroller/models/vc_record.py +++ b/aries_cloudcontroller/models/vc_record.py @@ -16,10 +16,9 @@ import json import pprint -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/w3_c_credentials_list_request.py b/aries_cloudcontroller/models/w3_c_credentials_list_request.py index 3ddc01ca..6ca2dfeb 100644 --- a/aries_cloudcontroller/models/w3_c_credentials_list_request.py +++ b/aries_cloudcontroller/models/w3_c_credentials_list_request.py @@ -19,7 +19,6 @@ from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictInt, StrictStr -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/wallet_record.py b/aries_cloudcontroller/models/wallet_record.py index ff0a8ce0..15e46498 100644 --- a/aries_cloudcontroller/models/wallet_record.py +++ b/aries_cloudcontroller/models/wallet_record.py @@ -17,10 +17,9 @@ import json import pprint import re -from typing import Any, ClassVar, Dict, List, Optional, Union +from typing import Any, ClassVar, Dict, List, Optional from pydantic import BaseModel, Field, StrictStr, field_validator -from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG From 142d40a4e7c1bee9a6f60b4bb17e96762385d3eb Mon Sep 17 00:00:00 2001 From: ff137 Date: Fri, 10 Nov 2023 12:14:45 +0200 Subject: [PATCH 5/9] :art: regenerate --- aries_cloudcontroller/api/connection_api.py | 24 ++++------ .../api/credential_definition_api.py | 30 +++++-------- aries_cloudcontroller/api/credentials_api.py | 44 +++++-------------- aries_cloudcontroller/api/did_exchange_api.py | 24 ++++------ .../api/present_proof_v10_api.py | 16 ++----- .../api/present_proof_v20_api.py | 16 ++----- aries_cloudcontroller/api/revocation_api.py | 36 +++++---------- aries_cloudcontroller/api/schema_api.py | 18 +++----- aries_cloudcontroller/api/wallet_api.py | 12 ++--- aries_cloudcontroller/models/did.py | 2 +- 10 files changed, 69 insertions(+), 153 deletions(-) diff --git a/aries_cloudcontroller/api/connection_api.py b/aries_cloudcontroller/api/connection_api.py index 611737a0..928a89da 100644 --- a/aries_cloudcontroller/api/connection_api.py +++ b/aries_cloudcontroller/api/connection_api.py @@ -61,8 +61,7 @@ async def accept_invitation( Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[StrictStr], - Field(description="My URL endpoint"), + Optional[StrictStr], Field(description="My URL endpoint") ] = None, my_label: Annotated[ Optional[StrictStr], Field(description="Label for connection") @@ -111,8 +110,7 @@ async def accept_invitation_with_http_info( Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[StrictStr], - Field(description="My URL endpoint"), + Optional[StrictStr], Field(description="My URL endpoint") ] = None, my_label: Annotated[ Optional[StrictStr], Field(description="Label for connection") @@ -237,8 +235,7 @@ async def accept_request( self, conn_id: Annotated[StrictStr, Field(description="Connection identifier")], my_endpoint: Annotated[ - Optional[StrictStr], - Field(description="My URL endpoint"), + Optional[StrictStr], Field(description="My URL endpoint") ] = None, **kwargs, ) -> ConnRecord: @@ -274,8 +271,7 @@ async def accept_request_with_http_info( self, conn_id: Annotated[StrictStr, Field(description="Connection identifier")], my_endpoint: Annotated[ - Optional[StrictStr], - Field(description="My URL endpoint"), + Optional[StrictStr], Field(description="My URL endpoint") ] = None, **kwargs, ) -> ApiResponse: @@ -1284,8 +1280,7 @@ async def get_connections( Optional[StrictStr], Field(description="Connection protocol used") ] = None, invitation_key: Annotated[ - Optional[StrictStr], - Field(description="invitation key"), + Optional[StrictStr], Field(description="invitation key") ] = None, invitation_msg_id: Annotated[ Optional[StrictStr], @@ -1299,8 +1294,7 @@ async def get_connections( Optional[StrictStr], Field(description="Their DID") ] = None, their_public_did: Annotated[ - Optional[StrictStr], - Field(description="Their Public DID"), + Optional[StrictStr], Field(description="Their Public DID") ] = None, their_role: Annotated[ Optional[StrictStr], @@ -1364,8 +1358,7 @@ async def get_connections_with_http_info( Optional[StrictStr], Field(description="Connection protocol used") ] = None, invitation_key: Annotated[ - Optional[StrictStr], - Field(description="invitation key"), + Optional[StrictStr], Field(description="invitation key") ] = None, invitation_msg_id: Annotated[ Optional[StrictStr], @@ -1379,8 +1372,7 @@ async def get_connections_with_http_info( Optional[StrictStr], Field(description="Their DID") ] = None, their_public_did: Annotated[ - Optional[StrictStr], - Field(description="Their Public DID"), + Optional[StrictStr], Field(description="Their Public DID") ] = None, their_role: Annotated[ Optional[StrictStr], diff --git a/aries_cloudcontroller/api/credential_definition_api.py b/aries_cloudcontroller/api/credential_definition_api.py index 85d89153..eacad9cd 100644 --- a/aries_cloudcontroller/api/credential_definition_api.py +++ b/aries_cloudcontroller/api/credential_definition_api.py @@ -189,27 +189,22 @@ async def credential_definitions_cred_def_id_write_record_post_with_http_info( async def get_created_cred_defs( self, cred_def_id: Annotated[ - Optional[StrictStr], - Field(description="Credential definition id"), + Optional[StrictStr], Field(description="Credential definition id") ] = None, issuer_did: Annotated[ - Optional[StrictStr], - Field(description="Issuer DID"), + Optional[StrictStr], Field(description="Issuer DID") ] = None, schema_id: Annotated[ - Optional[StrictStr], - Field(description="Schema identifier"), + Optional[StrictStr], Field(description="Schema identifier") ] = None, schema_issuer_did: Annotated[ - Optional[StrictStr], - Field(description="Schema issuer DID"), + Optional[StrictStr], Field(description="Schema issuer DID") ] = None, schema_name: Annotated[ Optional[StrictStr], Field(description="Schema name") ] = None, schema_version: Annotated[ - Optional[StrictStr], - Field(description="Schema version"), + Optional[StrictStr], Field(description="Schema version") ] = None, **kwargs, ) -> CredentialDefinitionsCreatedResult: @@ -256,27 +251,22 @@ async def get_created_cred_defs( async def get_created_cred_defs_with_http_info( self, cred_def_id: Annotated[ - Optional[StrictStr], - Field(description="Credential definition id"), + Optional[StrictStr], Field(description="Credential definition id") ] = None, issuer_did: Annotated[ - Optional[StrictStr], - Field(description="Issuer DID"), + Optional[StrictStr], Field(description="Issuer DID") ] = None, schema_id: Annotated[ - Optional[StrictStr], - Field(description="Schema identifier"), + Optional[StrictStr], Field(description="Schema identifier") ] = None, schema_issuer_did: Annotated[ - Optional[StrictStr], - Field(description="Schema issuer DID"), + Optional[StrictStr], Field(description="Schema issuer DID") ] = None, schema_name: Annotated[ Optional[StrictStr], Field(description="Schema name") ] = None, schema_version: Annotated[ - Optional[StrictStr], - Field(description="Schema version"), + Optional[StrictStr], Field(description="Schema version") ] = None, **kwargs, ) -> ApiResponse: diff --git a/aries_cloudcontroller/api/credentials_api.py b/aries_cloudcontroller/api/credentials_api.py index ddcecf6b..be1a0b8d 100644 --- a/aries_cloudcontroller/api/credentials_api.py +++ b/aries_cloudcontroller/api/credentials_api.py @@ -585,16 +585,11 @@ async def get_record_with_http_info( async def get_records( self, count: Annotated[ - Optional[StrictStr], - Field(description="Maximum number to retrieve"), - ] = None, - start: Annotated[ - Optional[StrictStr], - Field(description="Start index"), + Optional[StrictStr], Field(description="Maximum number to retrieve") ] = None, + start: Annotated[Optional[StrictStr], Field(description="Start index")] = None, wql: Annotated[ - Optional[StrictStr], - Field(description="(JSON) WQL query"), + Optional[StrictStr], Field(description="(JSON) WQL query") ] = None, **kwargs, ) -> CredInfoList: @@ -632,16 +627,11 @@ async def get_records( async def get_records_with_http_info( self, count: Annotated[ - Optional[StrictStr], - Field(description="Maximum number to retrieve"), - ] = None, - start: Annotated[ - Optional[StrictStr], - Field(description="Start index"), + Optional[StrictStr], Field(description="Maximum number to retrieve") ] = None, + start: Annotated[Optional[StrictStr], Field(description="Start index")] = None, wql: Annotated[ - Optional[StrictStr], - Field(description="(JSON) WQL query"), + Optional[StrictStr], Field(description="(JSON) WQL query") ] = None, **kwargs, ) -> ApiResponse: @@ -1062,16 +1052,11 @@ async def get_w3c_credential_with_http_info( async def get_w3c_credentials( self, count: Annotated[ - Optional[StrictStr], - Field(description="Maximum number to retrieve"), - ] = None, - start: Annotated[ - Optional[StrictStr], - Field(description="Start index"), + Optional[StrictStr], Field(description="Maximum number to retrieve") ] = None, + start: Annotated[Optional[StrictStr], Field(description="Start index")] = None, wql: Annotated[ - Optional[StrictStr], - Field(description="(JSON) WQL query"), + Optional[StrictStr], Field(description="(JSON) WQL query") ] = None, body: Optional[W3CCredentialsListRequest] = None, **kwargs, @@ -1113,16 +1098,11 @@ async def get_w3c_credentials( async def get_w3c_credentials_with_http_info( self, count: Annotated[ - Optional[StrictStr], - Field(description="Maximum number to retrieve"), - ] = None, - start: Annotated[ - Optional[StrictStr], - Field(description="Start index"), + Optional[StrictStr], Field(description="Maximum number to retrieve") ] = None, + start: Annotated[Optional[StrictStr], Field(description="Start index")] = None, wql: Annotated[ - Optional[StrictStr], - Field(description="(JSON) WQL query"), + Optional[StrictStr], Field(description="(JSON) WQL query") ] = None, body: Optional[W3CCredentialsListRequest] = None, **kwargs, diff --git a/aries_cloudcontroller/api/did_exchange_api.py b/aries_cloudcontroller/api/did_exchange_api.py index a5a709b9..dac1716e 100644 --- a/aries_cloudcontroller/api/did_exchange_api.py +++ b/aries_cloudcontroller/api/did_exchange_api.py @@ -41,8 +41,7 @@ async def accept_invitation( self, conn_id: Annotated[StrictStr, Field(description="Connection identifier")], my_endpoint: Annotated[ - Optional[StrictStr], - Field(description="My URL endpoint"), + Optional[StrictStr], Field(description="My URL endpoint") ] = None, my_label: Annotated[ Optional[StrictStr], Field(description="Label for connection request") @@ -84,8 +83,7 @@ async def accept_invitation_with_http_info( self, conn_id: Annotated[StrictStr, Field(description="Connection identifier")], my_endpoint: Annotated[ - Optional[StrictStr], - Field(description="My URL endpoint"), + Optional[StrictStr], Field(description="My URL endpoint") ] = None, my_label: Annotated[ Optional[StrictStr], Field(description="Label for connection request") @@ -209,8 +207,7 @@ async def accept_request( Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[StrictStr], - Field(description="My URL endpoint"), + Optional[StrictStr], Field(description="My URL endpoint") ] = None, **kwargs, ) -> ConnRecord: @@ -253,8 +250,7 @@ async def accept_request_with_http_info( Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[StrictStr], - Field(description="My URL endpoint"), + Optional[StrictStr], Field(description="My URL endpoint") ] = None, **kwargs, ) -> ApiResponse: @@ -396,8 +392,7 @@ async def create_request( Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[StrictStr], - Field(description="My URL endpoint"), + Optional[StrictStr], Field(description="My URL endpoint") ] = None, my_label: Annotated[ Optional[StrictStr], Field(description="Label for connection request") @@ -483,8 +478,7 @@ async def create_request_with_http_info( Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[StrictStr], - Field(description="My URL endpoint"), + Optional[StrictStr], Field(description="My URL endpoint") ] = None, my_label: Annotated[ Optional[StrictStr], Field(description="Label for connection request") @@ -653,8 +647,7 @@ async def receive_request( Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[StrictStr], - Field(description="My URL endpoint"), + Optional[StrictStr], Field(description="My URL endpoint") ] = None, body: Optional[DIDXRequest] = None, **kwargs, @@ -710,8 +703,7 @@ async def receive_request_with_http_info( Field(description="Identifier for active mediation record to be used"), ] = None, my_endpoint: Annotated[ - Optional[StrictStr], - Field(description="My URL endpoint"), + Optional[StrictStr], Field(description="My URL endpoint") ] = None, body: Optional[DIDXRequest] = None, **kwargs, diff --git a/aries_cloudcontroller/api/present_proof_v10_api.py b/aries_cloudcontroller/api/present_proof_v10_api.py index f22ea236..8b27d0d6 100644 --- a/aries_cloudcontroller/api/present_proof_v10_api.py +++ b/aries_cloudcontroller/api/present_proof_v10_api.py @@ -345,8 +345,7 @@ async def get_matching_credentials( str, Field(strict=True, description="Presentation exchange identifier") ], count: Annotated[ - Optional[StrictStr], - Field(description="Maximum number to retrieve"), + Optional[StrictStr], Field(description="Maximum number to retrieve") ] = None, extra_query: Annotated[ Optional[StrictStr], @@ -356,10 +355,7 @@ async def get_matching_credentials( Optional[StrictStr], Field(description="Proof request referents of interest, comma-separated"), ] = None, - start: Annotated[ - Optional[StrictStr], - Field(description="Start index"), - ] = None, + start: Annotated[Optional[StrictStr], Field(description="Start index")] = None, **kwargs, ) -> List[IndyCredPrecis]: """Fetch credentials for a presentation request from wallet # noqa: E501 @@ -405,8 +401,7 @@ async def get_matching_credentials_with_http_info( str, Field(strict=True, description="Presentation exchange identifier") ], count: Annotated[ - Optional[StrictStr], - Field(description="Maximum number to retrieve"), + Optional[StrictStr], Field(description="Maximum number to retrieve") ] = None, extra_query: Annotated[ Optional[StrictStr], @@ -416,10 +411,7 @@ async def get_matching_credentials_with_http_info( Optional[StrictStr], Field(description="Proof request referents of interest, comma-separated"), ] = None, - start: Annotated[ - Optional[StrictStr], - Field(description="Start index"), - ] = None, + start: Annotated[Optional[StrictStr], Field(description="Start index")] = None, **kwargs, ) -> ApiResponse: """Fetch credentials for a presentation request from wallet # noqa: E501 diff --git a/aries_cloudcontroller/api/present_proof_v20_api.py b/aries_cloudcontroller/api/present_proof_v20_api.py index 4cc3a5d7..aa4ec4ce 100644 --- a/aries_cloudcontroller/api/present_proof_v20_api.py +++ b/aries_cloudcontroller/api/present_proof_v20_api.py @@ -343,8 +343,7 @@ async def get_matching_credentials( str, Field(strict=True, description="Presentation exchange identifier") ], count: Annotated[ - Optional[StrictStr], - Field(description="Maximum number to retrieve"), + Optional[StrictStr], Field(description="Maximum number to retrieve") ] = None, extra_query: Annotated[ Optional[StrictStr], @@ -354,10 +353,7 @@ async def get_matching_credentials( Optional[StrictStr], Field(description="Proof request referents of interest, comma-separated"), ] = None, - start: Annotated[ - Optional[StrictStr], - Field(description="Start index"), - ] = None, + start: Annotated[Optional[StrictStr], Field(description="Start index")] = None, **kwargs, ) -> List[IndyCredPrecis]: """Fetch credentials from wallet for presentation request # noqa: E501 @@ -403,8 +399,7 @@ async def get_matching_credentials_with_http_info( str, Field(strict=True, description="Presentation exchange identifier") ], count: Annotated[ - Optional[StrictStr], - Field(description="Maximum number to retrieve"), + Optional[StrictStr], Field(description="Maximum number to retrieve") ] = None, extra_query: Annotated[ Optional[StrictStr], @@ -414,10 +409,7 @@ async def get_matching_credentials_with_http_info( Optional[StrictStr], Field(description="Proof request referents of interest, comma-separated"), ] = None, - start: Annotated[ - Optional[StrictStr], - Field(description="Start index"), - ] = None, + start: Annotated[Optional[StrictStr], Field(description="Start index")] = None, **kwargs, ) -> ApiResponse: """Fetch credentials from wallet for presentation request # noqa: E501 diff --git a/aries_cloudcontroller/api/revocation_api.py b/aries_cloudcontroller/api/revocation_api.py index 724634e8..f36da3f9 100644 --- a/aries_cloudcontroller/api/revocation_api.py +++ b/aries_cloudcontroller/api/revocation_api.py @@ -627,8 +627,7 @@ async def get_active_registry_for_cred_def_with_http_info( async def get_created_registries( self, cred_def_id: Annotated[ - Optional[StrictStr], - Field(description="Credential definition identifier"), + Optional[StrictStr], Field(description="Credential definition identifier") ] = None, state: Annotated[ Optional[StrictStr], Field(description="Revocation registry state") @@ -666,8 +665,7 @@ async def get_created_registries( async def get_created_registries_with_http_info( self, cred_def_id: Annotated[ - Optional[StrictStr], - Field(description="Credential definition identifier"), + Optional[StrictStr], Field(description="Credential definition identifier") ] = None, state: Annotated[ Optional[StrictStr], Field(description="Revocation registry state") @@ -1058,16 +1056,13 @@ async def get_registry_issued_credentials_count_with_http_info( async def get_revocation_status( self, cred_ex_id: Annotated[ - Optional[StrictStr], - Field(description="Credential exchange identifier"), + Optional[StrictStr], Field(description="Credential exchange identifier") ] = None, cred_rev_id: Annotated[ - Optional[StrictStr], - Field(description="Credential revocation identifier"), + Optional[StrictStr], Field(description="Credential revocation identifier") ] = None, rev_reg_id: Annotated[ - Optional[StrictStr], - Field(description="Revocation registry identifier"), + Optional[StrictStr], Field(description="Revocation registry identifier") ] = None, **kwargs, ) -> CredRevRecordResult: @@ -1105,16 +1100,13 @@ async def get_revocation_status( async def get_revocation_status_with_http_info( self, cred_ex_id: Annotated[ - Optional[StrictStr], - Field(description="Credential exchange identifier"), + Optional[StrictStr], Field(description="Credential exchange identifier") ] = None, cred_rev_id: Annotated[ - Optional[StrictStr], - Field(description="Credential revocation identifier"), + Optional[StrictStr], Field(description="Credential revocation identifier") ] = None, rev_reg_id: Annotated[ - Optional[StrictStr], - Field(description="Revocation registry identifier"), + Optional[StrictStr], Field(description="Revocation registry identifier") ] = None, **kwargs, ) -> ApiResponse: @@ -1859,12 +1851,10 @@ async def revocation_active_registry_cred_def_id_rotate_post_with_http_info( async def revocation_registry_delete_tails_file_delete( self, cred_def_id: Annotated[ - Optional[StrictStr], - Field(description="Credential definition identifier"), + Optional[StrictStr], Field(description="Credential definition identifier") ] = None, rev_reg_id: Annotated[ - Optional[StrictStr], - Field(description="Revocation registry identifier"), + Optional[StrictStr], Field(description="Revocation registry identifier") ] = None, **kwargs, ) -> TailsDeleteResponse: @@ -1899,12 +1889,10 @@ async def revocation_registry_delete_tails_file_delete( async def revocation_registry_delete_tails_file_delete_with_http_info( self, cred_def_id: Annotated[ - Optional[StrictStr], - Field(description="Credential definition identifier"), + Optional[StrictStr], Field(description="Credential definition identifier") ] = None, rev_reg_id: Annotated[ - Optional[StrictStr], - Field(description="Revocation registry identifier"), + Optional[StrictStr], Field(description="Revocation registry identifier") ] = None, **kwargs, ) -> ApiResponse: diff --git a/aries_cloudcontroller/api/schema_api.py b/aries_cloudcontroller/api/schema_api.py index d61665aa..96e1f8e4 100644 --- a/aries_cloudcontroller/api/schema_api.py +++ b/aries_cloudcontroller/api/schema_api.py @@ -42,19 +42,16 @@ def __init__(self, api_client=None) -> None: async def get_created_schemas( self, schema_id: Annotated[ - Optional[StrictStr], - Field(description="Schema identifier"), + Optional[StrictStr], Field(description="Schema identifier") ] = None, schema_issuer_did: Annotated[ - Optional[StrictStr], - Field(description="Schema issuer DID"), + Optional[StrictStr], Field(description="Schema issuer DID") ] = None, schema_name: Annotated[ Optional[StrictStr], Field(description="Schema name") ] = None, schema_version: Annotated[ - Optional[StrictStr], - Field(description="Schema version"), + Optional[StrictStr], Field(description="Schema version") ] = None, **kwargs, ) -> SchemasCreatedResult: @@ -95,19 +92,16 @@ async def get_created_schemas( async def get_created_schemas_with_http_info( self, schema_id: Annotated[ - Optional[StrictStr], - Field(description="Schema identifier"), + Optional[StrictStr], Field(description="Schema identifier") ] = None, schema_issuer_did: Annotated[ - Optional[StrictStr], - Field(description="Schema issuer DID"), + Optional[StrictStr], Field(description="Schema issuer DID") ] = None, schema_name: Annotated[ Optional[StrictStr], Field(description="Schema name") ] = None, schema_version: Annotated[ - Optional[StrictStr], - Field(description="Schema version"), + Optional[StrictStr], Field(description="Schema version") ] = None, **kwargs, ) -> ApiResponse: diff --git a/aries_cloudcontroller/api/wallet_api.py b/aries_cloudcontroller/api/wallet_api.py index 0d1ec02c..54b6be94 100644 --- a/aries_cloudcontroller/api/wallet_api.py +++ b/aries_cloudcontroller/api/wallet_api.py @@ -324,8 +324,7 @@ async def get_did_endpoint_with_http_info( async def get_dids( self, did: Annotated[ - Optional[StrictStr], - Field(description="DID of interest"), + Optional[StrictStr], Field(description="DID of interest") ] = None, key_type: Annotated[ Optional[StrictStr], Field(description="Key type to query for.") @@ -343,8 +342,7 @@ async def get_dids( ), ] = None, verkey: Annotated[ - Optional[StrictStr], - Field(description="Verification key of interest"), + Optional[StrictStr], Field(description="Verification key of interest") ] = None, **kwargs, ) -> DIDList: @@ -388,8 +386,7 @@ async def get_dids( async def get_dids_with_http_info( self, did: Annotated[ - Optional[StrictStr], - Field(description="DID of interest"), + Optional[StrictStr], Field(description="DID of interest") ] = None, key_type: Annotated[ Optional[StrictStr], Field(description="Key type to query for.") @@ -407,8 +404,7 @@ async def get_dids_with_http_info( ), ] = None, verkey: Annotated[ - Optional[StrictStr], - Field(description="Verification key of interest"), + Optional[StrictStr], Field(description="Verification key of interest") ] = None, **kwargs, ) -> ApiResponse: diff --git a/aries_cloudcontroller/models/did.py b/aries_cloudcontroller/models/did.py index e007c686..c1f5f6b4 100644 --- a/aries_cloudcontroller/models/did.py +++ b/aries_cloudcontroller/models/did.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Literal, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG from aries_cloudcontroller.util.regex_patterns import BBS_PATTERN, ED25519_PATTERN From a9e6b67462235aa0fa06368d6c48f14343eb9ea4 Mon Sep 17 00:00:00 2001 From: ff137 Date: Fri, 10 Nov 2023 12:14:56 +0200 Subject: [PATCH 6/9] move autoflake to end of postprocessing --- generator/scripts/postprocess-client.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generator/scripts/postprocess-client.sh b/generator/scripts/postprocess-client.sh index 841637ae..eec936d3 100755 --- a/generator/scripts/postprocess-client.sh +++ b/generator/scripts/postprocess-client.sh @@ -6,9 +6,6 @@ cd "$(dirname "$0")/../../generated/" || exit # Move to /generated folder # Remove `# noqa: F401` comment indicating to ignore unused imports, for autoflake find aries_cloudcontroller -type f -name '*.py' | xargs sed -i 's/# noqa: F401//' -# autoflake to remove unused imports -autoflake aries_cloudcontroller -i -r --remove-all-unused-imports --ignore-init-module-imports - # Cleanup generated models for file in aries_cloudcontroller/models/*.py; do # Replace the model config with DEFAULT_PYDANTIC_MODEL_CONFIG @@ -71,6 +68,9 @@ sed -i 's/Annotated\[str, Field(strict=True)\]/StrictStr/g' aries_cloudcontrolle # Additionally, the API Client we modify so that query_params are converted from bool to str, before being submitted to ACA-Py # This change impacts multiple lines, calling `sanitize_for_serialization` +# autoflake to remove unused imports +autoflake aries_cloudcontroller -i -r --remove-all-unused-imports --ignore-init-module-imports + # Black format and optimise imports black aries_cloudcontroller isort aries_cloudcontroller --profile black From a7aee60deb7a8ecea65543128e0de6182031494c Mon Sep 17 00:00:00 2001 From: ff137 Date: Fri, 10 Nov 2023 12:24:48 +0200 Subject: [PATCH 7/9] :art: add missing imports --- aries_cloudcontroller/models/attach_decorator_data1_jws.py | 2 +- aries_cloudcontroller/models/attach_decorator_data_jws.py | 2 +- .../models/attach_decorator_data_jws_header.py | 2 +- .../models/clear_pending_revocations_request.py | 2 +- aries_cloudcontroller/models/connection_static_result.py | 2 +- aries_cloudcontroller/models/cred_def_value_primary.py | 2 +- .../models/credential_definition_send_result.py | 2 +- .../models/credential_definitions_created_result.py | 2 +- aries_cloudcontroller/models/did_endpoint.py | 2 +- aries_cloudcontroller/models/endpoints_result.py | 2 +- aries_cloudcontroller/models/generated.py | 2 +- aries_cloudcontroller/models/get_did_endpoint_response.py | 2 +- aries_cloudcontroller/models/get_did_verkey_response.py | 2 +- aries_cloudcontroller/models/indy_cred_abstract.py | 2 +- aries_cloudcontroller/models/indy_cred_request.py | 2 +- aries_cloudcontroller/models/indy_credential.py | 2 +- aries_cloudcontroller/models/indy_eq_proof.py | 2 +- aries_cloudcontroller/models/indy_ge_proof.py | 2 +- aries_cloudcontroller/models/indy_primary_proof_eq_proof.py | 2 +- aries_cloudcontroller/models/indy_proof_identifier.py | 2 +- aries_cloudcontroller/models/indy_rev_reg_entry.py | 2 +- aries_cloudcontroller/models/jws_create.py | 2 +- aries_cloudcontroller/models/jws_verify.py | 2 +- aries_cloudcontroller/models/publish_revocations.py | 2 +- aries_cloudcontroller/models/rev_reg_create_request.py | 2 +- aries_cloudcontroller/models/rev_regs_created.py | 2 +- aries_cloudcontroller/models/schema_send_result.py | 2 +- aries_cloudcontroller/models/schemas_created_result.py | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/aries_cloudcontroller/models/attach_decorator_data1_jws.py b/aries_cloudcontroller/models/attach_decorator_data1_jws.py index 8866693e..751803ec 100644 --- a/aries_cloudcontroller/models/attach_decorator_data1_jws.py +++ b/aries_cloudcontroller/models/attach_decorator_data1_jws.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.models.attach_decorator_data_jws_header import ( AttachDecoratorDataJWSHeader, diff --git a/aries_cloudcontroller/models/attach_decorator_data_jws.py b/aries_cloudcontroller/models/attach_decorator_data_jws.py index 09496c39..69f78aa4 100644 --- a/aries_cloudcontroller/models/attach_decorator_data_jws.py +++ b/aries_cloudcontroller/models/attach_decorator_data_jws.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.models.attach_decorator_data1_jws import ( AttachDecoratorData1JWS, diff --git a/aries_cloudcontroller/models/attach_decorator_data_jws_header.py b/aries_cloudcontroller/models/attach_decorator_data_jws_header.py index 5536a283..3a0f393f 100644 --- a/aries_cloudcontroller/models/attach_decorator_data_jws_header.py +++ b/aries_cloudcontroller/models/attach_decorator_data_jws_header.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/clear_pending_revocations_request.py b/aries_cloudcontroller/models/clear_pending_revocations_request.py index 0018c481..5e21d056 100644 --- a/aries_cloudcontroller/models/clear_pending_revocations_request.py +++ b/aries_cloudcontroller/models/clear_pending_revocations_request.py @@ -18,7 +18,7 @@ import pprint from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field +from pydantic import BaseModel, Field, StrictStr from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/connection_static_result.py b/aries_cloudcontroller/models/connection_static_result.py index e8a90f4c..20446b26 100644 --- a/aries_cloudcontroller/models/connection_static_result.py +++ b/aries_cloudcontroller/models/connection_static_result.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.models.conn_record import ConnRecord from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/cred_def_value_primary.py b/aries_cloudcontroller/models/cred_def_value_primary.py index 1e8b8b57..0bac495f 100644 --- a/aries_cloudcontroller/models/cred_def_value_primary.py +++ b/aries_cloudcontroller/models/cred_def_value_primary.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, field_validator +from pydantic import BaseModel, StrictStr, field_validator from aries_cloudcontroller.models.generated import Generated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/credential_definition_send_result.py b/aries_cloudcontroller/models/credential_definition_send_result.py index 7a347248..02a727ac 100644 --- a/aries_cloudcontroller/models/credential_definition_send_result.py +++ b/aries_cloudcontroller/models/credential_definition_send_result.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/credential_definitions_created_result.py b/aries_cloudcontroller/models/credential_definitions_created_result.py index dfa20289..765212f8 100644 --- a/aries_cloudcontroller/models/credential_definitions_created_result.py +++ b/aries_cloudcontroller/models/credential_definitions_created_result.py @@ -18,7 +18,7 @@ import pprint from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel +from pydantic import BaseModel, StrictStr from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/did_endpoint.py b/aries_cloudcontroller/models/did_endpoint.py index d63e9dda..5fcd5a02 100644 --- a/aries_cloudcontroller/models/did_endpoint.py +++ b/aries_cloudcontroller/models/did_endpoint.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/endpoints_result.py b/aries_cloudcontroller/models/endpoints_result.py index 73f90b75..ea2a9436 100644 --- a/aries_cloudcontroller/models/endpoints_result.py +++ b/aries_cloudcontroller/models/endpoints_result.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/generated.py b/aries_cloudcontroller/models/generated.py index d81567b5..efa64f2b 100644 --- a/aries_cloudcontroller/models/generated.py +++ b/aries_cloudcontroller/models/generated.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, field_validator +from pydantic import BaseModel, StrictStr, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/get_did_endpoint_response.py b/aries_cloudcontroller/models/get_did_endpoint_response.py index 774dec3a..9d1e62df 100644 --- a/aries_cloudcontroller/models/get_did_endpoint_response.py +++ b/aries_cloudcontroller/models/get_did_endpoint_response.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/get_did_verkey_response.py b/aries_cloudcontroller/models/get_did_verkey_response.py index 1ef5781f..48a2b62e 100644 --- a/aries_cloudcontroller/models/get_did_verkey_response.py +++ b/aries_cloudcontroller/models/get_did_verkey_response.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_cred_abstract.py b/aries_cloudcontroller/models/indy_cred_abstract.py index ee4f49e1..bf219841 100644 --- a/aries_cloudcontroller/models/indy_cred_abstract.py +++ b/aries_cloudcontroller/models/indy_cred_abstract.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.models.indy_key_correctness_proof import ( IndyKeyCorrectnessProof, diff --git a/aries_cloudcontroller/models/indy_cred_request.py b/aries_cloudcontroller/models/indy_cred_request.py index b681b75b..b6bf3074 100644 --- a/aries_cloudcontroller/models/indy_cred_request.py +++ b/aries_cloudcontroller/models/indy_cred_request.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_credential.py b/aries_cloudcontroller/models/indy_credential.py index 61939e36..29ed5dbd 100644 --- a/aries_cloudcontroller/models/indy_credential.py +++ b/aries_cloudcontroller/models/indy_credential.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.models.indy_attr_value import IndyAttrValue from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_eq_proof.py b/aries_cloudcontroller/models/indy_eq_proof.py index 1fc0044a..12190dff 100644 --- a/aries_cloudcontroller/models/indy_eq_proof.py +++ b/aries_cloudcontroller/models/indy_eq_proof.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, field_validator +from pydantic import BaseModel, StrictStr, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_ge_proof.py b/aries_cloudcontroller/models/indy_ge_proof.py index 444e6687..b2d0a842 100644 --- a/aries_cloudcontroller/models/indy_ge_proof.py +++ b/aries_cloudcontroller/models/indy_ge_proof.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, field_validator +from pydantic import BaseModel, StrictStr, field_validator from aries_cloudcontroller.models.indy_ge_proof_pred import IndyGEProofPred from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_primary_proof_eq_proof.py b/aries_cloudcontroller/models/indy_primary_proof_eq_proof.py index b7a94bd4..48129186 100644 --- a/aries_cloudcontroller/models/indy_primary_proof_eq_proof.py +++ b/aries_cloudcontroller/models/indy_primary_proof_eq_proof.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, field_validator +from pydantic import BaseModel, StrictStr, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_proof_identifier.py b/aries_cloudcontroller/models/indy_proof_identifier.py index 13693217..4682c75f 100644 --- a/aries_cloudcontroller/models/indy_proof_identifier.py +++ b/aries_cloudcontroller/models/indy_proof_identifier.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/indy_rev_reg_entry.py b/aries_cloudcontroller/models/indy_rev_reg_entry.py index 3e4bf1c0..77a32f4b 100644 --- a/aries_cloudcontroller/models/indy_rev_reg_entry.py +++ b/aries_cloudcontroller/models/indy_rev_reg_entry.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.models.indy_rev_reg_entry_value import IndyRevRegEntryValue from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/jws_create.py b/aries_cloudcontroller/models/jws_create.py index baf4ad4f..85016a1d 100644 --- a/aries_cloudcontroller/models/jws_create.py +++ b/aries_cloudcontroller/models/jws_create.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/jws_verify.py b/aries_cloudcontroller/models/jws_verify.py index ccfd124d..1a85bc57 100644 --- a/aries_cloudcontroller/models/jws_verify.py +++ b/aries_cloudcontroller/models/jws_verify.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, field_validator +from pydantic import BaseModel, StrictStr, field_validator from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/publish_revocations.py b/aries_cloudcontroller/models/publish_revocations.py index 399ab20c..bf191ccc 100644 --- a/aries_cloudcontroller/models/publish_revocations.py +++ b/aries_cloudcontroller/models/publish_revocations.py @@ -18,7 +18,7 @@ import pprint from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field +from pydantic import BaseModel, Field, StrictStr from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/rev_reg_create_request.py b/aries_cloudcontroller/models/rev_reg_create_request.py index 4d3eb89d..4fb323ff 100644 --- a/aries_cloudcontroller/models/rev_reg_create_request.py +++ b/aries_cloudcontroller/models/rev_reg_create_request.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from typing_extensions import Annotated from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/rev_regs_created.py b/aries_cloudcontroller/models/rev_regs_created.py index cad3d76b..57e03879 100644 --- a/aries_cloudcontroller/models/rev_regs_created.py +++ b/aries_cloudcontroller/models/rev_regs_created.py @@ -18,7 +18,7 @@ import pprint from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel +from pydantic import BaseModel, StrictStr from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/schema_send_result.py b/aries_cloudcontroller/models/schema_send_result.py index 5c689b20..24109cd2 100644 --- a/aries_cloudcontroller/models/schema_send_result.py +++ b/aries_cloudcontroller/models/schema_send_result.py @@ -19,7 +19,7 @@ import re from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel, Field, field_validator +from pydantic import BaseModel, Field, StrictStr, field_validator from aries_cloudcontroller.models.model_schema import ModelSchema from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG diff --git a/aries_cloudcontroller/models/schemas_created_result.py b/aries_cloudcontroller/models/schemas_created_result.py index 4179acef..eebadb92 100644 --- a/aries_cloudcontroller/models/schemas_created_result.py +++ b/aries_cloudcontroller/models/schemas_created_result.py @@ -18,7 +18,7 @@ import pprint from typing import Any, ClassVar, Dict, List, Optional -from pydantic import BaseModel +from pydantic import BaseModel, StrictStr from aries_cloudcontroller.util import DEFAULT_PYDANTIC_MODEL_CONFIG From fecfe249e538d843329a1f5cb0a7f9ba2aa23110 Mon Sep 17 00:00:00 2001 From: ff137 Date: Fri, 10 Nov 2023 12:30:49 +0200 Subject: [PATCH 8/9] =?UTF-8?q?=F0=9F=94=A7=20add=20pylint=20job=20to=20te?= =?UTF-8?q?sts,=20assert=20that=20all=20types=20are=20defined?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/python-test-publish.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-test-publish.yml b/.github/workflows/python-test-publish.yml index 65266e4f..06197557 100644 --- a/.github/workflows/python-test-publish.yml +++ b/.github/workflows/python-test-publish.yml @@ -39,13 +39,18 @@ jobs: python -m pip install --upgrade pip pip install \ isort~=5.12.0 \ - black~=23.9.1 + black~=23.9.1 \ + pylint~=3.0.2 - name: Check import style with isort run: | isort . --check --profile black --diff - name: Check code style with Black run: | black . --check --diff + - name: Check for undefined types with Pylint + run: | + set -e + pylint --disable=all --enable=E0602 $(find . -type f -name "*.py") deploy: runs-on: ubuntu-latest From 6a0844358ee1781895dc44b451fa79850df10d98 Mon Sep 17 00:00:00 2001 From: ff137 Date: Fri, 10 Nov 2023 12:44:06 +0200 Subject: [PATCH 9/9] version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b001b822..cb4cf5cf 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ def parse_requirements(filename: str): if __name__ == "__main__": setup( name=PACKAGE_NAME, - version="0.9.0-rev1", + version="0.9.0-beta14", description="A simple python client for controlling an ACA-Py agent", long_description=long_description, long_description_content_type="text/markdown",