Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Each Cloud Controller version maps to a specific ACA-Py version, which is outlin
| Aries Cloud Controller Version | Aries Cloud Agent Python Version |
| ------------------------------ | -------------------------------- |
| 0.5.1-0.5.2 | 0.7.3 |
| 0.6.0-0.6.2 | 0.7.4 |
| 0.6.0-0.6.3 | 0.7.4 |

## Features

Expand Down
2 changes: 1 addition & 1 deletion generator/data/__init__.patch
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ index 6a771f1..bef48bc 100644
+ "AcaPyClient",
"AMLRecord",
"ActionMenuFetchResult",
"AdminAPIMessageTracing",
"AdminConfig",
10 changes: 5 additions & 5 deletions generator/data/openapi.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/generator/data/openapi.yml b/generator/data/openapi.yml
index b438b6c..12ed983 100644
index 6a013a3..3a6608a 100644
--- a/generator/data/openapi.yml
+++ b/generator/data/openapi.yml
@@ -722,7 +722,9 @@ paths:
Expand Down Expand Up @@ -165,10 +165,10 @@ index b438b6c..12ed983 100644
- description: Either a DIDComm service object (as per RFC0067) or a DID
- string.
+ oneOf:
+ - type: object
+ description: Either a DIDComm service object (as per RFC0067) or a DID
+ string.
+ - type: string
+ - type: object
+ description: Either a DIDComm service object (as per RFC0067) or a DID
+ string.
+ - type: string
InvitationRecord:
type: object
properties:
Expand Down
16 changes: 8 additions & 8 deletions generator/data/openapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -274,13 +274,13 @@ paths:
type: string
enum:
- request
- start
- response
- invitation
- error
- active
- abandoned
- init
- invitation
- response
- active
- start
- completed
- name: their_did
in: query
Expand Down Expand Up @@ -6835,10 +6835,10 @@ components:
- did:sov:WgWxqztrNooG92RXvxSTWv
items:
oneOf:
- type: object
description: Either a DIDComm service object (as per RFC0067) or a DID
string.
- type: string
- type: object
description: Either a DIDComm service object (as per RFC0067) or a DID
string.
- type: string
InvitationRecord:
type: object
properties:
Expand Down
2 changes: 1 addition & 1 deletion generator/data/swagger.json

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions generator/scripts/generate-client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ java -ea -server -Duser.timezone=UTC -jar "$(pwd)/../../openapi-generator/modul
cp -r ../generated/aries_cloudcontroller/ ../aries_cloudcontroller/

# Apply the patches required
cd .. && git apply --verbose generator/data/__init__.patch

black .
cd ..
git apply --verbose generator/data/__init__.patch || {
# git apply failed! Warn the user
echo -e "$(tput setaf 1)\n\nFailed to apply patch. Client generation INCOMPLETE!\n\nPlease, ensure to fix this before proceeding.\n\n\n"
exit 1
}
black .
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def parse_requirements(filename: str):
if __name__ == "__main__":
setup(
name=PACKAGE_NAME,
version="0.6.2",
version="0.6.3",
description="A simple python package for controlling an aries agent through the admin-api interface",
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down