fix: remove top level union types for now

Signed-off-by: Timo Glastra <timo@animo.id>

Author: TimoGlastra

aries_cloudcontroller/acapy_client.py

@@ -1,3 +1,4 @@
+from typing import Optional
 from aiohttp.client import ClientSession
 
 from aries_cloudcontroller.client import Client
@@ -9,9 +10,9 @@ def __init__(
         self,
         base_url: str,
         *,
-        api_key: str = None,
-        admin_insecure: bool = False,
-        tenant_jwt: str = None,
+        api_key: Optional[str] = None,
+        admin_insecure: Optional[bool] = False,
+        tenant_jwt: Optional[str] = None,
     ):
 
         if not api_key and not admin_insecure:

aries_cloudcontroller/api/credential_definition.py

@@ -28,9 +28,6 @@
 from aries_cloudcontroller.model.credential_definitions_created_result import (
     CredentialDefinitionsCreatedResult,
 )
-from aries_cloudcontroller.model.txn_or_credential_definition_send_result import (
-    TxnOrCredentialDefinitionSendResult,
-)
 
 
 class CredentialDefinitionApi(Consumer):
@@ -66,7 +63,7 @@ async def publish_cred_def(
         conn_id: Optional[str] = None,
         create_transaction_for_endorser: Optional[bool] = None,
         body: Optional[CredentialDefinitionSendRequest] = None
-    ) -> Union[CredentialDefinitionSendResult, TxnOrCredentialDefinitionSendResult]:
+    ) -> CredentialDefinitionSendResult:
         """Sends a credential definition to the ledger"""
         return await self.__publish_cred_def(
             conn_id=conn_id,
@@ -102,5 +99,5 @@ def __publish_cred_def(
         conn_id: Query = None,
         create_transaction_for_endorser: Query = None,
         body: Body(type=CredentialDefinitionSendRequest) = {}
-    ) -> Union[CredentialDefinitionSendResult, TxnOrCredentialDefinitionSendResult]:
+    ) -> CredentialDefinitionSendResult:
         """Internal uplink method for publish_cred_def"""

aries_cloudcontroller/api/revocation.py

@@ -29,10 +29,6 @@
 )
 from aries_cloudcontroller.model.rev_regs_created import RevRegsCreated
 from aries_cloudcontroller.model.revoke_request import RevokeRequest
-from aries_cloudcontroller.model.txn_or_publish_revocations_result import (
-    TxnOrPublishRevocationsResult,
-)
-from aries_cloudcontroller.model.txn_or_rev_reg_result import TxnOrRevRegResult
 
 
 class RevocationApi(Consumer):
@@ -109,7 +105,7 @@ async def publish_rev_reg_def(
         rev_reg_id: str,
         conn_id: Optional[str] = None,
         create_transaction_for_endorser: Optional[bool] = None
-    ) -> Union[RevRegResult, TxnOrRevRegResult]:
+    ) -> RevRegResult:
         """Send revocation registry definition to ledger"""
         return await self.__publish_rev_reg_def(
             rev_reg_id=rev_reg_id,
@@ -137,7 +133,7 @@ async def publish_revocations(
         conn_id: Optional[str] = None,
         create_transaction_for_endorser: Optional[bool] = None,
         body: Optional[PublishRevocations] = None
-    ) -> Union[PublishRevocations, TxnOrPublishRevocationsResult]:
+    ) -> PublishRevocations:
         """Publish pending revocations to ledger"""
         return await self.__publish_revocations(
             conn_id=conn_id,
@@ -236,7 +232,7 @@ def __publish_rev_reg_def(
         rev_reg_id: str,
         conn_id: Query = None,
         create_transaction_for_endorser: Query = None
-    ) -> Union[RevRegResult, TxnOrRevRegResult]:
+    ) -> RevRegResult:
         """Internal uplink method for publish_rev_reg_def"""
 
     @returns.json
@@ -259,7 +255,7 @@ def __publish_revocations(
         conn_id: Query = None,
         create_transaction_for_endorser: Query = None,
         body: Body(type=PublishRevocations) = {}
-    ) -> Union[PublishRevocations, TxnOrPublishRevocationsResult]:
+    ) -> PublishRevocations:
         """Internal uplink method for publish_revocations"""
 
     @returns.json

aries_cloudcontroller/api/schema.py

@@ -20,7 +20,6 @@
 from aries_cloudcontroller.model.schema_send_request import SchemaSendRequest
 from aries_cloudcontroller.model.schema_send_result import SchemaSendResult
 from aries_cloudcontroller.model.schemas_created_result import SchemasCreatedResult
-from aries_cloudcontroller.model.txn_or_schema_send_result import TxnOrSchemaSendResult
 
 
 class SchemaApi(Consumer):
@@ -52,7 +51,7 @@ async def publish_schema(
         conn_id: Optional[str] = None,
         create_transaction_for_endorser: Optional[bool] = None,
         body: Optional[SchemaSendRequest] = None
-    ) -> Union[SchemaSendResult, TxnOrSchemaSendResult]:
+    ) -> SchemaSendResult:
         """Sends a schema to the ledger"""
         return await self.__publish_schema(
             conn_id=conn_id,
@@ -86,5 +85,5 @@ def __publish_schema(
         conn_id: Query = None,
         create_transaction_for_endorser: Query = None,
         body: Body(type=SchemaSendRequest) = {}
-    ) -> Union[SchemaSendResult, TxnOrSchemaSendResult]:
+    ) -> SchemaSendResult:
         """Internal uplink method for publish_schema"""

generator/data/openapi.patch

@@ -2,47 +2,39 @@ diff --git a/generator/data/openapi.yml b/generator/data/openapi.yml
 index 4582107..eea7e2d 100644
 --- a/generator/data/openapi.yml
 +++ b/generator/data/openapi.yml
-@@ -705,7 +705,9 @@ paths:
+@@ -705,7 +705,7 @@ paths:
            content:
              application/json:
                schema:
 -                $ref: '#/components/schemas/TxnOrCredentialDefinitionSendResult'
-+                oneOf:
-+                 - $ref: '#/components/schemas/CredentialDefinitionSendResult'
-+                 - $ref: '#/components/schemas/TxnOrCredentialDefinitionSendResult'
++                $ref: '#/components/schemas/CredentialDefinitionSendResult'
        x-codegen-request-body-name: body
        operationId: publish_cred_def
    /credential-definitions/created:
-@@ -3263,7 +3265,9 @@ paths:
+@@ -3263,7 +3263,7 @@ paths:
            content:
              application/json:
                schema:
 -                $ref: '#/components/schemas/TxnOrPublishRevocationsResult'
-+                oneOf:
-+                 - $ref: '#/components/schemas/PublishRevocations'
-+                 - $ref: '#/components/schemas/TxnOrPublishRevocationsResult'
++                $ref: '#/components/schemas/PublishRevocations'
        x-codegen-request-body-name: body
        operationId: publish_revocations
    /revocation/registries/created:
-@@ -3374,7 +3378,9 @@ paths:
+@@ -3374,7 +3374,7 @@ paths:
            content:
              application/json:
                schema:
 -                $ref: '#/components/schemas/TxnOrRevRegResult'
-+                oneOf:
-+                  - $ref: '#/components/schemas/RevRegResult'
-+                  - $ref: '#/components/schemas/TxnOrRevRegResult'
++                $ref: '#/components/schemas/RevRegResult'
        operationId: publish_rev_reg_def
    /revocation/registry/{rev_reg_id}/entry:
      post:
-@@ -3551,7 +3557,9 @@ paths:
+@@ -3551,7 +3551,7 @@ paths:
            content:
              application/json:
                schema:
 -                $ref: '#/components/schemas/TxnOrSchemaSendResult'
-+                oneOf:
-+                  - $ref: '#/components/schemas/SchemaSendResult'
-+                  - $ref: '#/components/schemas/TxnOrSchemaSendResult'
++                $ref: '#/components/schemas/SchemaSendResult'
        x-codegen-request-body-name: body
        operationId: publish_schema
    /schemas/created:

generator/data/openapi.yml

@@ -705,9 +705,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
-                  - $ref: "#/components/schemas/CredentialDefinitionSendResult"
-                  - $ref: "#/components/schemas/TxnOrCredentialDefinitionSendResult"
+                $ref: "#/components/schemas/CredentialDefinitionSendResult"
       x-codegen-request-body-name: body
       operationId: publish_cred_def
   /credential-definitions/created:
@@ -3269,9 +3267,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
-                  - $ref: "#/components/schemas/PublishRevocations"
-                  - $ref: "#/components/schemas/TxnOrPublishRevocationsResult"
+                $ref: "#/components/schemas/PublishRevocations"
       x-codegen-request-body-name: body
       operationId: publish_revocations
   /revocation/registries/created:
@@ -3382,9 +3378,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
-                  - $ref: "#/components/schemas/RevRegResult"
-                  - $ref: "#/components/schemas/TxnOrRevRegResult"
+                $ref: "#/components/schemas/RevRegResult"
       operationId: publish_rev_reg_def
   /revocation/registry/{rev_reg_id}/entry:
     post:
@@ -3561,9 +3555,7 @@ paths:
           content:
             application/json:
               schema:
-                oneOf:
-                  - $ref: "#/components/schemas/SchemaSendResult"
-                  - $ref: "#/components/schemas/TxnOrSchemaSendResult"
+                $ref: "#/components/schemas/SchemaSendResult"
       x-codegen-request-body-name: body
       operationId: publish_schema
   /schemas/created: