7ac70782b7217dc5a6e2a4112750329ecb74eb44

Author: github-actions[bot]

.openapi-generator/FILES

@@ -102,7 +102,7 @@ docs/StudysetList.md
 docs/StudysetRequest.md
 docs/StudysetRequestRelationships.md
 docs/StudysetRequestRelationshipsStudiesInner.md
-docs/StudysetRequestRelationshipsStudiesInnerOneOf.md
+docs/StudysetRequestRelationshipsStudiesInnerAnyOf.md
 docs/StudysetReturn.md
 docs/StudysetReturnRelationships.md
 docs/StudysetReturnRelationshipsStudies.md
@@ -228,7 +228,7 @@ neurostore_sdk/models/studyset_list.py
 neurostore_sdk/models/studyset_request.py
 neurostore_sdk/models/studyset_request_relationships.py
 neurostore_sdk/models/studyset_request_relationships_studies_inner.py
-neurostore_sdk/models/studyset_request_relationships_studies_inner_one_of.py
+neurostore_sdk/models/studyset_request_relationships_studies_inner_any_of.py
 neurostore_sdk/models/studyset_return.py
 neurostore_sdk/models/studyset_return_relationships.py
 neurostore_sdk/models/studyset_return_relationships_studies.py
@@ -249,4 +249,5 @@ setup.cfg
 setup.py
 test-requirements.txt
 test/__init__.py
+test/test_studyset_request_relationships_studies_inner_any_of.py
 tox.ini

README.md

@@ -306,7 +306,7 @@ Class | Method | HTTP request | Description
  - [StudysetRequest](docs/StudysetRequest.md)
  - [StudysetRequestRelationships](docs/StudysetRequestRelationships.md)
  - [StudysetRequestRelationshipsStudiesInner](docs/StudysetRequestRelationshipsStudiesInner.md)
- - [StudysetRequestRelationshipsStudiesInnerOneOf](docs/StudysetRequestRelationshipsStudiesInnerOneOf.md)
+ - [StudysetRequestRelationshipsStudiesInnerAnyOf](docs/StudysetRequestRelationshipsStudiesInnerAnyOf.md)
  - [StudysetReturn](docs/StudysetReturn.md)
  - [StudysetReturnRelationships](docs/StudysetReturnRelationships.md)
  - [StudysetReturnRelationshipsStudies](docs/StudysetReturnRelationshipsStudies.md)

docs/StudysetRequestRelationshipsStudiesInner.md

@@ -5,8 +5,19 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**id** | **str** |  | 
+**id** | **str** | short UUID specifying the location of this resource | 
 **curation_stub_uuid** | **str** |  | [optional] 
+**doi** | **str** | Digital object identifier of the study. | [optional] 
+**name** | **str** | Title of the study. | [optional] 
+**metadata** | **object** | Metadata associated with the study not covered by the other study attributes. | [optional] 
+**description** | **str** | Long form description of the study, typically the abstract. | [optional] 
+**publication** | **str** | The journal/place of publication for the study. | [optional] 
+**pmid** | **str** | If the study was published on PubMed, place the PubMed ID here. | [optional] 
+**authors** | **str** | The authors on the publication of this study. | [optional] 
+**year** | **int** | The year this study was published. | [optional] 
+**analyses** | [**StudyRequestRelationshipsAnalyses**](StudyRequestRelationshipsAnalyses.md) |  | [optional] 
+**public** | **bool** | whether the resource is listed in public searches or not | [optional] [default to True]
+**pmcid** | **str** |  | [optional] 
 
 ## Example
 

docs/StudysetRequestRelationshipsStudiesInnerAnyOf.md

@@ -0,0 +1,30 @@
+# StudysetRequestRelationshipsStudiesInnerAnyOf
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **str** |  | 
+**curation_stub_uuid** | **str** |  | [optional] 
+
+## Example
+
+```python
+from neurostore_sdk.models.studyset_request_relationships_studies_inner_any_of import StudysetRequestRelationshipsStudiesInnerAnyOf
+
+# TODO update the JSON string below
+json = "{}"
+# create an instance of StudysetRequestRelationshipsStudiesInnerAnyOf from a JSON string
+studyset_request_relationships_studies_inner_any_of_instance = StudysetRequestRelationshipsStudiesInnerAnyOf.from_json(json)
+# print the JSON string representation of the object
+print(StudysetRequestRelationshipsStudiesInnerAnyOf.to_json())
+
+# convert the object into a dict
+studyset_request_relationships_studies_inner_any_of_dict = studyset_request_relationships_studies_inner_any_of_instance.to_dict()
+# create an instance of StudysetRequestRelationshipsStudiesInnerAnyOf from a dict
+studyset_request_relationships_studies_inner_any_of_from_dict = StudysetRequestRelationshipsStudiesInnerAnyOf.from_dict(studyset_request_relationships_studies_inner_any_of_dict)
+```
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

neurostore_sdk/__init__.py

@@ -130,7 +130,7 @@
     "StudysetRequest",
     "StudysetRequestRelationships",
     "StudysetRequestRelationshipsStudiesInner",
-    "StudysetRequestRelationshipsStudiesInnerOneOf",
+    "StudysetRequestRelationshipsStudiesInnerAnyOf",
     "StudysetReturn",
     "StudysetReturnRelationships",
     "StudysetReturnRelationshipsStudies",
@@ -261,7 +261,7 @@
 from neurostore_sdk.models.studyset_request import StudysetRequest as StudysetRequest
 from neurostore_sdk.models.studyset_request_relationships import StudysetRequestRelationships as StudysetRequestRelationships
 from neurostore_sdk.models.studyset_request_relationships_studies_inner import StudysetRequestRelationshipsStudiesInner as StudysetRequestRelationshipsStudiesInner
-from neurostore_sdk.models.studyset_request_relationships_studies_inner_one_of import StudysetRequestRelationshipsStudiesInnerOneOf as StudysetRequestRelationshipsStudiesInnerOneOf
+from neurostore_sdk.models.studyset_request_relationships_studies_inner_any_of import StudysetRequestRelationshipsStudiesInnerAnyOf as StudysetRequestRelationshipsStudiesInnerAnyOf
 from neurostore_sdk.models.studyset_return import StudysetReturn as StudysetReturn
 from neurostore_sdk.models.studyset_return_relationships import StudysetReturnRelationships as StudysetReturnRelationships
 from neurostore_sdk.models.studyset_return_relationships_studies import StudysetReturnRelationshipsStudies as StudysetReturnRelationshipsStudies

neurostore_sdk/models/__init__.py

@@ -102,7 +102,7 @@
 from neurostore_sdk.models.studyset_request import StudysetRequest
 from neurostore_sdk.models.studyset_request_relationships import StudysetRequestRelationships
 from neurostore_sdk.models.studyset_request_relationships_studies_inner import StudysetRequestRelationshipsStudiesInner
-from neurostore_sdk.models.studyset_request_relationships_studies_inner_one_of import StudysetRequestRelationshipsStudiesInnerOneOf
+from neurostore_sdk.models.studyset_request_relationships_studies_inner_any_of import StudysetRequestRelationshipsStudiesInnerAnyOf
 from neurostore_sdk.models.studyset_return import StudysetReturn
 from neurostore_sdk.models.studyset_return_relationships import StudysetReturnRelationships
 from neurostore_sdk.models.studyset_return_relationships_studies import StudysetReturnRelationshipsStudies

neurostore_sdk/models/studyset_request_relationships_studies_inner.py

@@ -14,33 +14,41 @@
 
 
 from __future__ import annotations
+from inspect import getfullargspec
 import json
 import pprint
+import re  # noqa: F401
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
-from typing import Any, List, Optional
-from neurostore_sdk.models.studyset_request_relationships_studies_inner_one_of import StudysetRequestRelationshipsStudiesInnerOneOf
-from pydantic import StrictStr, Field
-from typing import Union, List, Set, Optional, Dict
+from typing import Optional
+from neurostore_sdk.models.study_request import StudyRequest
+from neurostore_sdk.models.studyset_request_relationships_studies_inner_any_of import StudysetRequestRelationshipsStudiesInnerAnyOf
+from typing import Union, Any, List, Set, TYPE_CHECKING, Optional, Dict
 from typing_extensions import Literal, Self
+from pydantic import Field
 
-STUDYSETREQUESTRELATIONSHIPSSTUDIESINNER_ONE_OF_SCHEMAS = ["StudysetRequestRelationshipsStudiesInnerOneOf", "str"]
+STUDYSETREQUESTRELATIONSHIPSSTUDIESINNER_ANY_OF_SCHEMAS = ["StudyRequest", "StudysetRequestRelationshipsStudiesInnerAnyOf", "str"]
 
 class StudysetRequestRelationshipsStudiesInner(BaseModel):
     """
     StudysetRequestRelationshipsStudiesInner
     """
-    # data type: str
-    oneof_schema_1_validator: Optional[StrictStr] = None
-    # data type: StudysetRequestRelationshipsStudiesInnerOneOf
-    oneof_schema_2_validator: Optional[StudysetRequestRelationshipsStudiesInnerOneOf] = None
-    actual_instance: Optional[Union[StudysetRequestRelationshipsStudiesInnerOneOf, str]] = None
-    one_of_schemas: Set[str] = { "StudysetRequestRelationshipsStudiesInnerOneOf", "str" }
-
-    model_config = ConfigDict(
-        validate_assignment=True,
-        protected_namespaces=(),
-    )
 
+    # data type: str
+    anyof_schema_1_validator: Optional[StrictStr] = None
+    # data type: StudysetRequestRelationshipsStudiesInnerAnyOf
+    anyof_schema_2_validator: Optional[StudysetRequestRelationshipsStudiesInnerAnyOf] = None
+    # data type: StudyRequest
+    anyof_schema_3_validator: Optional[StudyRequest] = None
+    if TYPE_CHECKING:
+        actual_instance: Optional[Union[StudyRequest, StudysetRequestRelationshipsStudiesInnerAnyOf, str]] = None
+    else:
+        actual_instance: Any = None
+    any_of_schemas: Set[str] = { "StudyRequest", "StudysetRequestRelationshipsStudiesInnerAnyOf", "str" }
+
+    model_config = {
+        "validate_assignment": True,
+        "protected_namespaces": (),
+    }
 
     def __init__(self, *args, **kwargs) -> None:
         if args:
@@ -53,63 +61,67 @@ def __init__(self, *args, **kwargs) -> None:
             super().__init__(**kwargs)
 
     @field_validator('actual_instance')
-    def actual_instance_must_validate_oneof(cls, v):
+    def actual_instance_must_validate_anyof(cls, v):
         instance = StudysetRequestRelationshipsStudiesInner.model_construct()
         error_messages = []
-        match = 0
         # validate data type: str
         try:
-            instance.oneof_schema_1_validator = v
-            match += 1
+            instance.anyof_schema_1_validator = v
+            return v
         except (ValidationError, ValueError) as e:
             error_messages.append(str(e))
-        # validate data type: StudysetRequestRelationshipsStudiesInnerOneOf
-        if not isinstance(v, StudysetRequestRelationshipsStudiesInnerOneOf):
-            error_messages.append(f"Error! Input type `{type(v)}` is not `StudysetRequestRelationshipsStudiesInnerOneOf`")
+        # validate data type: StudysetRequestRelationshipsStudiesInnerAnyOf
+        if not isinstance(v, StudysetRequestRelationshipsStudiesInnerAnyOf):
+            error_messages.append(f"Error! Input type `{type(v)}` is not `StudysetRequestRelationshipsStudiesInnerAnyOf`")
         else:
-            match += 1
-        if match > 1:
-            # more than 1 match
-            raise ValueError("Multiple matches found when setting `actual_instance` in StudysetRequestRelationshipsStudiesInner with oneOf schemas: StudysetRequestRelationshipsStudiesInnerOneOf, str. Details: " + ", ".join(error_messages))
-        elif match == 0:
+            return v
+
+        # validate data type: StudyRequest
+        if not isinstance(v, StudyRequest):
+            error_messages.append(f"Error! Input type `{type(v)}` is not `StudyRequest`")
+        else:
+            return v
+
+        if error_messages:
             # no match
-            raise ValueError("No match found when setting `actual_instance` in StudysetRequestRelationshipsStudiesInner with oneOf schemas: StudysetRequestRelationshipsStudiesInnerOneOf, str. Details: " + ", ".join(error_messages))
+            raise ValueError("No match found when setting the actual_instance in StudysetRequestRelationshipsStudiesInner with anyOf schemas: StudyRequest, StudysetRequestRelationshipsStudiesInnerAnyOf, str. Details: " + ", ".join(error_messages))
         else:
             return v
 
     @classmethod
-    def from_dict(cls, obj: Union[str, Dict[str, Any]]) -> Self:
+    def from_dict(cls, obj: Dict[str, Any]) -> Self:
         return cls.from_json(json.dumps(obj))
 
     @classmethod
     def from_json(cls, json_str: str) -> Self:
         """Returns the object represented by the json string"""
         instance = cls.model_construct()
         error_messages = []
-        match = 0
-
         # deserialize data into str
         try:
             # validation
-            instance.oneof_schema_1_validator = json.loads(json_str)
+            instance.anyof_schema_1_validator = json.loads(json_str)
             # assign value to actual_instance
-            instance.actual_instance = instance.oneof_schema_1_validator
-            match += 1
+            instance.actual_instance = instance.anyof_schema_1_validator
+            return instance
         except (ValidationError, ValueError) as e:
             error_messages.append(str(e))
-        # deserialize data into StudysetRequestRelationshipsStudiesInnerOneOf
+        # anyof_schema_2_validator: Optional[StudysetRequestRelationshipsStudiesInnerAnyOf] = None
+        try:
+            instance.actual_instance = StudysetRequestRelationshipsStudiesInnerAnyOf.from_json(json_str)
+            return instance
+        except (ValidationError, ValueError) as e:
+             error_messages.append(str(e))
+        # anyof_schema_3_validator: Optional[StudyRequest] = None
         try:
-            instance.actual_instance = StudysetRequestRelationshipsStudiesInnerOneOf.from_json(json_str)
-            match += 1
+            instance.actual_instance = StudyRequest.from_json(json_str)
+            return instance
         except (ValidationError, ValueError) as e:
-            error_messages.append(str(e))
+             error_messages.append(str(e))
 
-        if match > 1:
-            # more than 1 match
-            raise ValueError("Multiple matches found when deserializing the JSON string into StudysetRequestRelationshipsStudiesInner with oneOf schemas: StudysetRequestRelationshipsStudiesInnerOneOf, str. Details: " + ", ".join(error_messages))
-        elif match == 0:
+        if error_messages:
             # no match
-            raise ValueError("No match found when deserializing the JSON string into StudysetRequestRelationshipsStudiesInner with oneOf schemas: StudysetRequestRelationshipsStudiesInnerOneOf, str. Details: " + ", ".join(error_messages))
+            raise ValueError("No match found when deserializing the JSON string into StudysetRequestRelationshipsStudiesInner with anyOf schemas: StudyRequest, StudysetRequestRelationshipsStudiesInnerAnyOf, str. Details: " + ", ".join(error_messages))
         else:
             return instance
 
@@ -123,15 +135,14 @@ def to_json(self) -> str:
         else:
             return json.dumps(self.actual_instance)
 
-    def to_dict(self) -> Optional[Union[Dict[str, Any], StudysetRequestRelationshipsStudiesInnerOneOf, str]]:
+    def to_dict(self) -> Optional[Union[Dict[str, Any], StudyRequest, StudysetRequestRelationshipsStudiesInnerAnyOf, str]]:
         """Returns the dict representation of the actual instance"""
         if self.actual_instance is None:
             return None
 
         if hasattr(self.actual_instance, "to_dict") and callable(self.actual_instance.to_dict):
             return self.actual_instance.to_dict()
         else:
-            # primitive type
             return self.actual_instance
 
     def to_str(self) -> str:

neurostore_sdk/models/studyset_request_relationships_studies_inner_any_of.py

@@ -0,0 +1,91 @@
+# coding: utf-8
+
+"""
+    neurostore api
+
+    Create studysets for meta-analysis
+
+    The version of the OpenAPI document: 1.0
+    Contact: jamesdkent21@gmail.com
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import pprint
+import re  # noqa: F401
+import json
+
+from pydantic import BaseModel, ConfigDict, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from uuid import UUID
+from typing import Optional, Set
+from typing_extensions import Self
+
+class StudysetRequestRelationshipsStudiesInnerAnyOf(BaseModel):
+    """
+    StudysetRequestRelationshipsStudiesInnerAnyOf
+    """ # noqa: E501
+    id: StrictStr
+    curation_stub_uuid: Optional[UUID] = None
+    __properties: ClassVar[List[str]] = ["id", "curation_stub_uuid"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.model_dump(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Optional[Self]:
+        """Create an instance of StudysetRequestRelationshipsStudiesInnerAnyOf from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        """
+        excluded_fields: Set[str] = set([
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+        """Create an instance of StudysetRequestRelationshipsStudiesInnerAnyOf from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "id": obj.get("id"),
+            "curation_stub_uuid": obj.get("curation_stub_uuid")
+        })
+        return _obj
+
+