Merge pull request #1 from Edrolo/david/update

General client update

.github/workflows/python.yml

@@ -26,6 +26,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install flake8 pytest
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+          if [ -f test-requirements.txt ]; then pip install -r test-requirements.txt; fi
       - name: Lint with flake8
         run: |
           # stop the build if there are Python syntax errors or undefined names

.gitignore

@@ -64,3 +64,9 @@ target/
 
 #Ipython Notebook
 .ipynb_checkpoints
+
+# Environment variables
+.envrc
+
+# Visual Studio Code
+.vscode/

.gitlab-ci.yml

@@ -22,4 +22,10 @@ pytest-3.8:
   image: python:3.8-alpine
 pytest-3.9:
   extends: .pytest
-  image: python:3.9-alpine
+  image: python:3.9-alpine
+pytest-3.10:
+  extends: .pytest
+  image: python:3.10-alpine
+pytest-3.11:
+  extends: .pytest
+  image: python:3.11-alpine

.openapi-generator/FILES

@@ -6,17 +6,18 @@ README.md
 docs/ACL.md
 docs/ACLIdsInner.md
 docs/ACLIdsInnerOneOf.md
-docs/ClassLessons.md
-docs/ClassStudents.md
-docs/ClassSubject.md
-docs/ClassSubjectOneOf.md
 docs/ClassesApi.md
 docs/Contact.md
+docs/ContactDetails.md
+docs/ContactDetailsEmails.md
 docs/DateTimeObject.md
 docs/Deletion.md
 docs/DeletionsApi.md
+docs/EducationDetails.md
 docs/Employee.md
+docs/EmployeeContactDetails.md
 docs/EmployeesApi.md
+docs/GetSchool200Response.md
 docs/GetSchoolAcl200Response.md
 docs/GetSchoolClass200Response.md
 docs/GetSchoolMeta200Response.md
@@ -32,20 +33,26 @@ docs/ListSchoolStudents200Response.md
 docs/ListSchoolSubjects200Response.md
 docs/ListSchools200Response.md
 docs/Meta.md
-docs/ModelClass.md
 docs/Pagination.md
 docs/Permission.md
 docs/RequestSchoolAccess200Response.md
 docs/RequestSchoolAccessRequest.md
 docs/School.md
 docs/SchoolAddress.md
 docs/SchoolAddressAddressCountry.md
+docs/SchoolClass.md
+docs/SchoolClassEmployees.md
+docs/SchoolClassLessons.md
+docs/SchoolClassStudents.md
+docs/SchoolClassSubject.md
+docs/SchoolClassSubjectOneOf.md
 docs/SchoolExtended.md
 docs/SchoolMeta.md
 docs/SchoolRegion.md
 docs/SchoolRegionIdentifiers.md
 docs/SchoolsApi.md
 docs/Student.md
+docs/StudentEducationDetails.md
 docs/StudentsApi.md
 docs/Subject.md
 docs/SubjectsApi.md
@@ -58,17 +65,18 @@ test/__init__.py
 test/test_acl.py
 test/test_acl_ids_inner.py
 test/test_acl_ids_inner_one_of.py
-test/test_class_lessons.py
-test/test_class_students.py
-test/test_class_subject.py
-test/test_class_subject_one_of.py
 test/test_classes_api.py
 test/test_contact.py
+test/test_contact_details.py
+test/test_contact_details_emails.py
 test/test_date_time_object.py
 test/test_deletion.py
 test/test_deletions_api.py
+test/test_education_details.py
 test/test_employee.py
+test/test_employee_contact_details.py
 test/test_employees_api.py
+test/test_get_school200_response.py
 test/test_get_school_acl200_response.py
 test/test_get_school_class200_response.py
 test/test_get_school_meta200_response.py
@@ -84,20 +92,26 @@ test/test_list_school_students200_response.py
 test/test_list_school_subjects200_response.py
 test/test_list_schools200_response.py
 test/test_meta.py
-test/test_model_class.py
 test/test_pagination.py
 test/test_permission.py
 test/test_request_school_access200_response.py
 test/test_request_school_access_request.py
 test/test_school.py
 test/test_school_address.py
 test/test_school_address_address_country.py
+test/test_school_class.py
+test/test_school_class_employees.py
+test/test_school_class_lessons.py
+test/test_school_class_students.py
+test/test_school_class_subject.py
+test/test_school_class_subject_one_of.py
 test/test_school_extended.py
 test/test_school_meta.py
 test/test_school_region.py
 test/test_school_region_identifiers.py
 test/test_schools_api.py
 test/test_student.py
+test/test_student_education_details.py
 test/test_students_api.py
 test/test_subject.py
 test/test_subjects_api.py
@@ -119,14 +133,15 @@ wonde/models/__init__.py
 wonde/models/acl.py
 wonde/models/acl_ids_inner.py
 wonde/models/acl_ids_inner_one_of.py
-wonde/models/class_lessons.py
-wonde/models/class_students.py
-wonde/models/class_subject.py
-wonde/models/class_subject_one_of.py
 wonde/models/contact.py
+wonde/models/contact_details.py
+wonde/models/contact_details_emails.py
 wonde/models/date_time_object.py
 wonde/models/deletion.py
+wonde/models/education_details.py
 wonde/models/employee.py
+wonde/models/employee_contact_details.py
+wonde/models/get_school200_response.py
 wonde/models/get_school_acl200_response.py
 wonde/models/get_school_class200_response.py
 wonde/models/get_school_meta200_response.py
@@ -141,18 +156,25 @@ wonde/models/list_school_students200_response.py
 wonde/models/list_school_subjects200_response.py
 wonde/models/list_schools200_response.py
 wonde/models/meta.py
-wonde/models/model_class.py
 wonde/models/pagination.py
 wonde/models/permission.py
 wonde/models/request_school_access200_response.py
 wonde/models/request_school_access_request.py
 wonde/models/school.py
 wonde/models/school_address.py
 wonde/models/school_address_address_country.py
+wonde/models/school_class.py
+wonde/models/school_class_employees.py
+wonde/models/school_class_lessons.py
+wonde/models/school_class_students.py
+wonde/models/school_class_subject.py
+wonde/models/school_class_subject_one_of.py
 wonde/models/school_extended.py
 wonde/models/school_meta.py
 wonde/models/school_region.py
 wonde/models/school_region_identifiers.py
 wonde/models/student.py
+wonde/models/student_education_details.py
 wonde/models/subject.py
+wonde/py.typed
 wonde/rest.py

.openapi-generator/VERSION

@@ -1 +1 @@
-6.6.0
+7.0.1

README.md

@@ -5,7 +5,7 @@ This Python package is automatically generated by the [OpenAPI Generator](https:
 
 - API version: 1.0.0
 - Package version: 0.1.0
-- Build package: org.openapitools.codegen.languages.PythonNextgenClientCodegen
+- Build package: org.openapitools.codegen.languages.PythonClientCodegen
 
 ## Requirements.
 
@@ -88,11 +88,11 @@ with wonde.ApiClient(configuration) as api_client:
 
     try:
         # Get specific class for a school
-        api_response = api_instance.schools_school_id_classes_class_id_get(school_id, class_id, include=include)
-        print("The response of ClassesApi->schools_school_id_classes_class_id_get:\n")
+        api_response = api_instance.get_school_class(school_id, class_id, include=include)
+        print("The response of ClassesApi->get_school_class:\n")
         pprint(api_response)
     except ApiException as e:
-        print("Exception when calling ClassesApi->schools_school_id_classes_class_id_get: %s\n" % e)
+        print("Exception when calling ClassesApi->get_school_class: %s\n" % e)
 
 ```
 
@@ -102,72 +102,79 @@ All URIs are relative to *https://api.wonde.com/v1.0*
 
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
-*ClassesApi* | [**schools_school_id_classes_class_id_get**](docs/ClassesApi.md#schools_school_id_classes_class_id_get) | **GET** /schools/{school_id}/classes/{class_id} | Get specific class for a school
-*ClassesApi* | [**schools_school_id_classes_get**](docs/ClassesApi.md#schools_school_id_classes_get) | **GET** /schools/{school_id}/classes | Get all classes for a school
-*DeletionsApi* | [**schools_school_id_deletions_get**](docs/DeletionsApi.md#schools_school_id_deletions_get) | **GET** /schools/{school_id}/deletions | Get deletions for a school
-*EmployeesApi* | [**schools_school_id_employees_employee_id_get**](docs/EmployeesApi.md#schools_school_id_employees_employee_id_get) | **GET** /schools/{school_id}/employees/{employee_id} | Get specific employee for a school
-*EmployeesApi* | [**schools_school_id_employees_get**](docs/EmployeesApi.md#schools_school_id_employees_get) | **GET** /schools/{school_id}/employees | Get all employees for a school
-*LessonsApi* | [**get_school_lesson_by_id**](docs/LessonsApi.md#get_school_lesson_by_id) | **GET** /schools/{school_id}/lessons/{lesson_id} | Returns a specific lesson for a specific school
-*LessonsApi* | [**get_school_lessons**](docs/LessonsApi.md#get_school_lessons) | **GET** /schools/{school_id}/lessons | Returns a list of lessons for a specific school
+*ClassesApi* | [**get_school_class**](docs/ClassesApi.md#get_school_class) | **GET** /schools/{school_id}/classes/{class_id} | Get specific class for a school
+*ClassesApi* | [**list_school_classes**](docs/ClassesApi.md#list_school_classes) | **GET** /schools/{school_id}/classes | Get all classes for a school
+*DeletionsApi* | [**list_school_deletions**](docs/DeletionsApi.md#list_school_deletions) | **GET** /schools/{school_id}/deletions | Get deletions for a school
+*EmployeesApi* | [**get_school_employee**](docs/EmployeesApi.md#get_school_employee) | **GET** /schools/{school_id}/employees/{employee_id} | Get specific employee for a school
+*EmployeesApi* | [**list_school_employees**](docs/EmployeesApi.md#list_school_employees) | **GET** /schools/{school_id}/employees | Get all employees for a school
+*LessonsApi* | [**get_school_lesson**](docs/LessonsApi.md#get_school_lesson) | **GET** /schools/{school_id}/lessons/{lesson_id} | Returns a specific lesson for a specific school
+*LessonsApi* | [**list_school_lessons**](docs/LessonsApi.md#list_school_lessons) | **GET** /schools/{school_id}/lessons | Returns a list of lessons for a specific school
 *SchoolsApi* | [**get_school**](docs/SchoolsApi.md#get_school) | **GET** /schools/{school_id} | Retrieve a specific school
-*SchoolsApi* | [**meta_schools_school_id_acl_get**](docs/SchoolsApi.md#meta_schools_school_id_acl_get) | **GET** /meta/schools/{school_id}/acl | Retrieve the access control list applied to a school
-*SchoolsApi* | [**meta_schools_school_id_get**](docs/SchoolsApi.md#meta_schools_school_id_get) | **GET** /meta/schools/{school_id} | Retrieve meta data for a school
-*SchoolsApi* | [**meta_schools_school_id_permissions_get**](docs/SchoolsApi.md#meta_schools_school_id_permissions_get) | **GET** /meta/schools/{school_id}/permissions | Retrieve the permissions applied to a school
-*SchoolsApi* | [**schools_all_get**](docs/SchoolsApi.md#schools_all_get) | **GET** /schools/all | Retrieve all schools
-*SchoolsApi* | [**schools_approved_get**](docs/SchoolsApi.md#schools_approved_get) | **GET** /schools/approved | Retrieve all approved schools
-*SchoolsApi* | [**schools_audited_get**](docs/SchoolsApi.md#schools_audited_get) | **GET** /schools/audited | Retrieve all audited schools
-*SchoolsApi* | [**schools_declined_get**](docs/SchoolsApi.md#schools_declined_get) | **GET** /schools/declined | Retrieve all schools with declined access
-*SchoolsApi* | [**schools_offline_get**](docs/SchoolsApi.md#schools_offline_get) | **GET** /schools/offline | Retrieve all offline schools
-*SchoolsApi* | [**schools_pending_get**](docs/SchoolsApi.md#schools_pending_get) | **GET** /schools/pending | Retrieve all schools with pending access request
-*SchoolsApi* | [**schools_revoked_get**](docs/SchoolsApi.md#schools_revoked_get) | **GET** /schools/revoked | Retrieve all schools with revoked access
-*SchoolsApi* | [**schools_school_id_request_access_post**](docs/SchoolsApi.md#schools_school_id_request_access_post) | **POST** /schools/{school_id}/request-access | Request access to a school
-*SchoolsApi* | [**schools_school_id_revoke_access_delete**](docs/SchoolsApi.md#schools_school_id_revoke_access_delete) | **DELETE** /schools/{school_id}/revoke-access | Revoke access to a school
-*StudentsApi* | [**get_student**](docs/StudentsApi.md#get_student) | **GET** /schools/{school_id}/students/{student_id} | Retrieve a specific student in a specific school
-*StudentsApi* | [**list_students**](docs/StudentsApi.md#list_students) | **GET** /schools/{school_id}/students | Retrieve a list of students for a specific school
-*SubjectsApi* | [**get_subject**](docs/SubjectsApi.md#get_subject) | **GET** /schools/{school_id}/subjects/{subject_id} | Retrieve a specific subject for a school
-*SubjectsApi* | [**get_subjects**](docs/SubjectsApi.md#get_subjects) | **GET** /schools/{school_id}/subjects | Retrieve subjects for a school
+*SchoolsApi* | [**get_school_acl**](docs/SchoolsApi.md#get_school_acl) | **GET** /meta/schools/{school_id}/acl | Retrieve the access control list applied to a school
+*SchoolsApi* | [**get_school_meta**](docs/SchoolsApi.md#get_school_meta) | **GET** /meta/schools/{school_id} | Retrieve meta data for a school
+*SchoolsApi* | [**get_school_permissions**](docs/SchoolsApi.md#get_school_permissions) | **GET** /meta/schools/{school_id}/permissions | Retrieve the permissions applied to a school
+*SchoolsApi* | [**list_schools**](docs/SchoolsApi.md#list_schools) | **GET** /schools/all | Retrieve all schools
+*SchoolsApi* | [**list_schools_approved**](docs/SchoolsApi.md#list_schools_approved) | **GET** /schools | Retrieve all approved schools
+*SchoolsApi* | [**list_schools_audited**](docs/SchoolsApi.md#list_schools_audited) | **GET** /schools/audited | Retrieve all audited schools
+*SchoolsApi* | [**list_schools_declined**](docs/SchoolsApi.md#list_schools_declined) | **GET** /schools/declined | Retrieve all schools with declined access
+*SchoolsApi* | [**list_schools_offline**](docs/SchoolsApi.md#list_schools_offline) | **GET** /schools/offline | Retrieve all offline schools
+*SchoolsApi* | [**list_schools_pending**](docs/SchoolsApi.md#list_schools_pending) | **GET** /schools/pending | Retrieve all schools with pending access request
+*SchoolsApi* | [**list_schools_revoked**](docs/SchoolsApi.md#list_schools_revoked) | **GET** /schools/revoked | Retrieve all schools with revoked access
+*SchoolsApi* | [**request_school_access**](docs/SchoolsApi.md#request_school_access) | **POST** /schools/{school_id}/request-access | Request access to a school
+*SchoolsApi* | [**revoke_school_access**](docs/SchoolsApi.md#revoke_school_access) | **DELETE** /schools/{school_id}/revoke-access | Revoke access to a school
+*StudentsApi* | [**get_school_student**](docs/StudentsApi.md#get_school_student) | **GET** /schools/{school_id}/students/{student_id} | Retrieve a specific student in a specific school
+*StudentsApi* | [**list_school_students**](docs/StudentsApi.md#list_school_students) | **GET** /schools/{school_id}/students | Retrieve a list of students for a specific school
+*SubjectsApi* | [**get_school_subject**](docs/SubjectsApi.md#get_school_subject) | **GET** /schools/{school_id}/subjects/{subject_id} | Retrieve a specific subject for a school
+*SubjectsApi* | [**list_school_subjects**](docs/SubjectsApi.md#list_school_subjects) | **GET** /schools/{school_id}/subjects | Retrieve subjects for a school
 
 
 ## Documentation For Models
 
  - [ACL](docs/ACL.md)
  - [ACLIdsInner](docs/ACLIdsInner.md)
  - [ACLIdsInnerOneOf](docs/ACLIdsInnerOneOf.md)
- - [ClassLessons](docs/ClassLessons.md)
- - [ClassStudents](docs/ClassStudents.md)
- - [ClassSubject](docs/ClassSubject.md)
- - [ClassSubjectOneOf](docs/ClassSubjectOneOf.md)
  - [Contact](docs/Contact.md)
+ - [ContactDetails](docs/ContactDetails.md)
+ - [ContactDetailsEmails](docs/ContactDetailsEmails.md)
  - [DateTimeObject](docs/DateTimeObject.md)
  - [Deletion](docs/Deletion.md)
+ - [EducationDetails](docs/EducationDetails.md)
  - [Employee](docs/Employee.md)
- - [GetSchoolLessons200Response](docs/GetSchoolLessons200Response.md)
- - [GetSchoolLessons200ResponseMeta](docs/GetSchoolLessons200ResponseMeta.md)
- - [GetSubjects200Response](docs/GetSubjects200Response.md)
+ - [EmployeeContactDetails](docs/EmployeeContactDetails.md)
+ - [GetSchool200Response](docs/GetSchool200Response.md)
+ - [GetSchoolAcl200Response](docs/GetSchoolAcl200Response.md)
+ - [GetSchoolClass200Response](docs/GetSchoolClass200Response.md)
+ - [GetSchoolMeta200Response](docs/GetSchoolMeta200Response.md)
+ - [GetSchoolPermissions200Response](docs/GetSchoolPermissions200Response.md)
  - [Lesson](docs/Lesson.md)
- - [ListStudents200Response](docs/ListStudents200Response.md)
+ - [ListSchoolClasses200Response](docs/ListSchoolClasses200Response.md)
+ - [ListSchoolDeletions200Response](docs/ListSchoolDeletions200Response.md)
+ - [ListSchoolEmployees200Response](docs/ListSchoolEmployees200Response.md)
+ - [ListSchoolLessons200Response](docs/ListSchoolLessons200Response.md)
+ - [ListSchoolLessons200ResponseMeta](docs/ListSchoolLessons200ResponseMeta.md)
+ - [ListSchoolStudents200Response](docs/ListSchoolStudents200Response.md)
+ - [ListSchoolSubjects200Response](docs/ListSchoolSubjects200Response.md)
+ - [ListSchools200Response](docs/ListSchools200Response.md)
  - [Meta](docs/Meta.md)
- - [MetaSchoolsSchoolIdAclGet200Response](docs/MetaSchoolsSchoolIdAclGet200Response.md)
- - [MetaSchoolsSchoolIdGet200Response](docs/MetaSchoolsSchoolIdGet200Response.md)
- - [MetaSchoolsSchoolIdPermissionsGet200Response](docs/MetaSchoolsSchoolIdPermissionsGet200Response.md)
- - [ModelClass](docs/ModelClass.md)
  - [Pagination](docs/Pagination.md)
  - [Permission](docs/Permission.md)
+ - [RequestSchoolAccess200Response](docs/RequestSchoolAccess200Response.md)
+ - [RequestSchoolAccessRequest](docs/RequestSchoolAccessRequest.md)
  - [School](docs/School.md)
  - [SchoolAddress](docs/SchoolAddress.md)
  - [SchoolAddressAddressCountry](docs/SchoolAddressAddressCountry.md)
+ - [SchoolClass](docs/SchoolClass.md)
+ - [SchoolClassEmployees](docs/SchoolClassEmployees.md)
+ - [SchoolClassLessons](docs/SchoolClassLessons.md)
+ - [SchoolClassStudents](docs/SchoolClassStudents.md)
+ - [SchoolClassSubject](docs/SchoolClassSubject.md)
+ - [SchoolClassSubjectOneOf](docs/SchoolClassSubjectOneOf.md)
  - [SchoolExtended](docs/SchoolExtended.md)
  - [SchoolMeta](docs/SchoolMeta.md)
  - [SchoolRegion](docs/SchoolRegion.md)
  - [SchoolRegionIdentifiers](docs/SchoolRegionIdentifiers.md)
- - [SchoolsAllGet200Response](docs/SchoolsAllGet200Response.md)
- - [SchoolsSchoolIdClassesClassIdGet200Response](docs/SchoolsSchoolIdClassesClassIdGet200Response.md)
- - [SchoolsSchoolIdClassesGet200Response](docs/SchoolsSchoolIdClassesGet200Response.md)
- - [SchoolsSchoolIdDeletionsGet200Response](docs/SchoolsSchoolIdDeletionsGet200Response.md)
- - [SchoolsSchoolIdEmployeesGet200Response](docs/SchoolsSchoolIdEmployeesGet200Response.md)
- - [SchoolsSchoolIdRequestAccessPost200Response](docs/SchoolsSchoolIdRequestAccessPost200Response.md)
- - [SchoolsSchoolIdRequestAccessPostRequest](docs/SchoolsSchoolIdRequestAccessPostRequest.md)
  - [Student](docs/Student.md)
+ - [StudentEducationDetails](docs/StudentEducationDetails.md)
  - [Subject](docs/Subject.md)
 
 
@@ -188,3 +195,7 @@ Authentication schemes defined for the API:
 
 
 ## Author
+
+
+
+