h2ogpte 1.6.43rc8__py3-none-any.whl → 1.6.44__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- h2ogpte/__init__.py +1 -1
- h2ogpte/connectors.py +10 -4
- h2ogpte/h2ogpte.py +86 -0
- h2ogpte/h2ogpte_async.py +86 -0
- h2ogpte/rest_async/__init__.py +1 -1
- h2ogpte/rest_async/api/collections_api.py +249 -0
- h2ogpte/rest_async/api/permissions_api.py +6 -6
- h2ogpte/rest_async/api_client.py +1 -1
- h2ogpte/rest_async/configuration.py +1 -1
- h2ogpte/rest_async/models/global_configuration_item.py +10 -2
- h2ogpte/rest_async/models/s3_credentials.py +12 -8
- h2ogpte/rest_async/models/user_permission.py +5 -3
- h2ogpte/rest_sync/__init__.py +1 -1
- h2ogpte/rest_sync/api/collections_api.py +249 -0
- h2ogpte/rest_sync/api/permissions_api.py +6 -6
- h2ogpte/rest_sync/api_client.py +1 -1
- h2ogpte/rest_sync/configuration.py +1 -1
- h2ogpte/rest_sync/models/global_configuration_item.py +10 -2
- h2ogpte/rest_sync/models/s3_credentials.py +12 -8
- h2ogpte/rest_sync/models/user_permission.py +5 -3
- h2ogpte/session.py +1 -0
- h2ogpte/session_async.py +1 -0
- h2ogpte/types.py +3 -0
- {h2ogpte-1.6.43rc8.dist-info → h2ogpte-1.6.44.dist-info}/METADATA +1 -1
- {h2ogpte-1.6.43rc8.dist-info → h2ogpte-1.6.44.dist-info}/RECORD +28 -28
- {h2ogpte-1.6.43rc8.dist-info → h2ogpte-1.6.44.dist-info}/WHEEL +0 -0
- {h2ogpte-1.6.43rc8.dist-info → h2ogpte-1.6.44.dist-info}/entry_points.txt +0 -0
- {h2ogpte-1.6.43rc8.dist-info → h2ogpte-1.6.44.dist-info}/top_level.txt +0 -0
|
@@ -17,20 +17,22 @@ import pprint
|
|
|
17
17
|
import re # noqa: F401
|
|
18
18
|
import json
|
|
19
19
|
|
|
20
|
-
from pydantic import BaseModel, ConfigDict, StrictStr
|
|
20
|
+
from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr
|
|
21
21
|
from typing import Any, ClassVar, Dict, List, Optional
|
|
22
22
|
from typing import Optional, Set
|
|
23
23
|
from typing_extensions import Self
|
|
24
24
|
|
|
25
25
|
class S3Credentials(BaseModel):
|
|
26
26
|
"""
|
|
27
|
-
The object with S3 credentials. If the object is not provided, only public buckets will be accessible.
|
|
27
|
+
The object with S3 credentials. If the object is not provided, only public buckets will be accessible. When use_irsa is true, access_key_id and secret_access_key are optional and the pod's service account will be used for authentication.
|
|
28
28
|
""" # noqa: E501
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
29
|
+
use_irsa: Optional[StrictBool] = Field(default=False, description="Enable IAM Roles for Service Accounts (IRSA) to authenticate using the pod's service account. When enabled, explicit credentials are not required.")
|
|
30
|
+
access_key_id: Optional[StrictStr] = Field(default=None, description="AWS access key ID. Not required when using IRSA.")
|
|
31
|
+
secret_access_key: Optional[StrictStr] = Field(default=None, description="AWS secret access key. Not required when using IRSA.")
|
|
32
|
+
session_token: Optional[StrictStr] = Field(default=None, description="AWS session token for temporary credentials.")
|
|
33
|
+
role_arn: Optional[StrictStr] = Field(default=None, description="The Amazon Resource Name (ARN) of IAM Role that will be utilized for accessing the S3 storage. When IRSA is enabled, this role will be assumed from the service account identity (role chaining). When IRSA is disabled, it requires specification of other credentials to identify an identity the role will be associated with.")
|
|
34
|
+
external_id: Optional[StrictStr] = Field(default=None, description="Optional security token for assuming cross-account roles. This is used to prevent the 'confused deputy' problem when a third party assumes a role in your account. Only required if the role's trust policy requires an external ID.")
|
|
35
|
+
__properties: ClassVar[List[str]] = ["use_irsa", "access_key_id", "secret_access_key", "session_token", "role_arn", "external_id"]
|
|
34
36
|
|
|
35
37
|
model_config = ConfigDict(
|
|
36
38
|
populate_by_name=True,
|
|
@@ -83,10 +85,12 @@ class S3Credentials(BaseModel):
|
|
|
83
85
|
return cls.model_validate(obj)
|
|
84
86
|
|
|
85
87
|
_obj = cls.model_validate({
|
|
88
|
+
"use_irsa": obj.get("use_irsa") if obj.get("use_irsa") is not None else False,
|
|
86
89
|
"access_key_id": obj.get("access_key_id"),
|
|
87
90
|
"secret_access_key": obj.get("secret_access_key"),
|
|
88
91
|
"session_token": obj.get("session_token"),
|
|
89
|
-
"role_arn": obj.get("role_arn")
|
|
92
|
+
"role_arn": obj.get("role_arn"),
|
|
93
|
+
"external_id": obj.get("external_id")
|
|
90
94
|
})
|
|
91
95
|
return _obj
|
|
92
96
|
|
|
@@ -17,7 +17,7 @@ import pprint
|
|
|
17
17
|
import re # noqa: F401
|
|
18
18
|
import json
|
|
19
19
|
|
|
20
|
-
from pydantic import BaseModel, ConfigDict, StrictStr
|
|
20
|
+
from pydantic import BaseModel, ConfigDict, Field, StrictStr
|
|
21
21
|
from typing import Any, ClassVar, Dict, List, Optional
|
|
22
22
|
from typing import Optional, Set
|
|
23
23
|
from typing_extensions import Self
|
|
@@ -30,7 +30,8 @@ class UserPermission(BaseModel):
|
|
|
30
30
|
name: StrictStr
|
|
31
31
|
description: Optional[StrictStr] = None
|
|
32
32
|
category: Optional[StrictStr] = None
|
|
33
|
-
|
|
33
|
+
dependencies: Optional[List[StrictStr]] = Field(default=None, description="List of permissions that this permission depends on.")
|
|
34
|
+
__properties: ClassVar[List[str]] = ["id", "name", "description", "category", "dependencies"]
|
|
34
35
|
|
|
35
36
|
model_config = ConfigDict(
|
|
36
37
|
populate_by_name=True,
|
|
@@ -86,7 +87,8 @@ class UserPermission(BaseModel):
|
|
|
86
87
|
"id": obj.get("id"),
|
|
87
88
|
"name": obj.get("name"),
|
|
88
89
|
"description": obj.get("description"),
|
|
89
|
-
"category": obj.get("category")
|
|
90
|
+
"category": obj.get("category"),
|
|
91
|
+
"dependencies": obj.get("dependencies")
|
|
90
92
|
})
|
|
91
93
|
return _obj
|
|
92
94
|
|
h2ogpte/rest_sync/__init__.py
CHANGED
|
@@ -9559,6 +9559,255 @@ class CollectionsApi:
|
|
|
9559
9559
|
|
|
9560
9560
|
|
|
9561
9561
|
|
|
9562
|
+
@validate_call
|
|
9563
|
+
def reset_all_collection_expirations(
|
|
9564
|
+
self,
|
|
9565
|
+
_request_timeout: Union[
|
|
9566
|
+
None,
|
|
9567
|
+
Annotated[StrictFloat, Field(gt=0)],
|
|
9568
|
+
Tuple[
|
|
9569
|
+
Annotated[StrictFloat, Field(gt=0)],
|
|
9570
|
+
Annotated[StrictFloat, Field(gt=0)]
|
|
9571
|
+
]
|
|
9572
|
+
] = None,
|
|
9573
|
+
_request_auth: Optional[Dict[StrictStr, Any]] = None,
|
|
9574
|
+
_content_type: Optional[StrictStr] = None,
|
|
9575
|
+
_headers: Optional[Dict[StrictStr, Any]] = None,
|
|
9576
|
+
_host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
|
|
9577
|
+
) -> None:
|
|
9578
|
+
"""Reset all collection expiry dates and inactivity intervals that have been set.
|
|
9579
|
+
|
|
9580
|
+
Reset any expiry dates and inactivity intervals that have been set for all collections (admin only). This will also reset any archived collections back to active.
|
|
9581
|
+
|
|
9582
|
+
:param _request_timeout: timeout setting for this request. If one
|
|
9583
|
+
number provided, it will be total request
|
|
9584
|
+
timeout. It can also be a pair (tuple) of
|
|
9585
|
+
(connection, read) timeouts.
|
|
9586
|
+
:type _request_timeout: int, tuple(int, int), optional
|
|
9587
|
+
:param _request_auth: set to override the auth_settings for an a single
|
|
9588
|
+
request; this effectively ignores the
|
|
9589
|
+
authentication in the spec for a single request.
|
|
9590
|
+
:type _request_auth: dict, optional
|
|
9591
|
+
:param _content_type: force content-type for the request.
|
|
9592
|
+
:type _content_type: str, Optional
|
|
9593
|
+
:param _headers: set to override the headers for a single
|
|
9594
|
+
request; this effectively ignores the headers
|
|
9595
|
+
in the spec for a single request.
|
|
9596
|
+
:type _headers: dict, optional
|
|
9597
|
+
:param _host_index: set to override the host_index for a single
|
|
9598
|
+
request; this effectively ignores the host_index
|
|
9599
|
+
in the spec for a single request.
|
|
9600
|
+
:type _host_index: int, optional
|
|
9601
|
+
:return: Returns the result object.
|
|
9602
|
+
""" # noqa: E501
|
|
9603
|
+
|
|
9604
|
+
_param = self._reset_all_collection_expirations_serialize(
|
|
9605
|
+
_request_auth=_request_auth,
|
|
9606
|
+
_content_type=_content_type,
|
|
9607
|
+
_headers=_headers,
|
|
9608
|
+
_host_index=_host_index
|
|
9609
|
+
)
|
|
9610
|
+
|
|
9611
|
+
_response_types_map: Dict[str, Optional[str]] = {
|
|
9612
|
+
'204': None,
|
|
9613
|
+
'401': "EndpointError",
|
|
9614
|
+
}
|
|
9615
|
+
response_data = self.api_client.call_api(
|
|
9616
|
+
*_param,
|
|
9617
|
+
_request_timeout=_request_timeout
|
|
9618
|
+
)
|
|
9619
|
+
response_data.read()
|
|
9620
|
+
return self.api_client.response_deserialize(
|
|
9621
|
+
response_data=response_data,
|
|
9622
|
+
response_types_map=_response_types_map,
|
|
9623
|
+
).data
|
|
9624
|
+
|
|
9625
|
+
|
|
9626
|
+
@validate_call
|
|
9627
|
+
def reset_all_collection_expirations_with_http_info(
|
|
9628
|
+
self,
|
|
9629
|
+
_request_timeout: Union[
|
|
9630
|
+
None,
|
|
9631
|
+
Annotated[StrictFloat, Field(gt=0)],
|
|
9632
|
+
Tuple[
|
|
9633
|
+
Annotated[StrictFloat, Field(gt=0)],
|
|
9634
|
+
Annotated[StrictFloat, Field(gt=0)]
|
|
9635
|
+
]
|
|
9636
|
+
] = None,
|
|
9637
|
+
_request_auth: Optional[Dict[StrictStr, Any]] = None,
|
|
9638
|
+
_content_type: Optional[StrictStr] = None,
|
|
9639
|
+
_headers: Optional[Dict[StrictStr, Any]] = None,
|
|
9640
|
+
_host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
|
|
9641
|
+
) -> ApiResponse[None]:
|
|
9642
|
+
"""Reset all collection expiry dates and inactivity intervals that have been set.
|
|
9643
|
+
|
|
9644
|
+
Reset any expiry dates and inactivity intervals that have been set for all collections (admin only). This will also reset any archived collections back to active.
|
|
9645
|
+
|
|
9646
|
+
:param _request_timeout: timeout setting for this request. If one
|
|
9647
|
+
number provided, it will be total request
|
|
9648
|
+
timeout. It can also be a pair (tuple) of
|
|
9649
|
+
(connection, read) timeouts.
|
|
9650
|
+
:type _request_timeout: int, tuple(int, int), optional
|
|
9651
|
+
:param _request_auth: set to override the auth_settings for an a single
|
|
9652
|
+
request; this effectively ignores the
|
|
9653
|
+
authentication in the spec for a single request.
|
|
9654
|
+
:type _request_auth: dict, optional
|
|
9655
|
+
:param _content_type: force content-type for the request.
|
|
9656
|
+
:type _content_type: str, Optional
|
|
9657
|
+
:param _headers: set to override the headers for a single
|
|
9658
|
+
request; this effectively ignores the headers
|
|
9659
|
+
in the spec for a single request.
|
|
9660
|
+
:type _headers: dict, optional
|
|
9661
|
+
:param _host_index: set to override the host_index for a single
|
|
9662
|
+
request; this effectively ignores the host_index
|
|
9663
|
+
in the spec for a single request.
|
|
9664
|
+
:type _host_index: int, optional
|
|
9665
|
+
:return: Returns the result object.
|
|
9666
|
+
""" # noqa: E501
|
|
9667
|
+
|
|
9668
|
+
_param = self._reset_all_collection_expirations_serialize(
|
|
9669
|
+
_request_auth=_request_auth,
|
|
9670
|
+
_content_type=_content_type,
|
|
9671
|
+
_headers=_headers,
|
|
9672
|
+
_host_index=_host_index
|
|
9673
|
+
)
|
|
9674
|
+
|
|
9675
|
+
_response_types_map: Dict[str, Optional[str]] = {
|
|
9676
|
+
'204': None,
|
|
9677
|
+
'401': "EndpointError",
|
|
9678
|
+
}
|
|
9679
|
+
response_data = self.api_client.call_api(
|
|
9680
|
+
*_param,
|
|
9681
|
+
_request_timeout=_request_timeout
|
|
9682
|
+
)
|
|
9683
|
+
response_data.read()
|
|
9684
|
+
return self.api_client.response_deserialize(
|
|
9685
|
+
response_data=response_data,
|
|
9686
|
+
response_types_map=_response_types_map,
|
|
9687
|
+
)
|
|
9688
|
+
|
|
9689
|
+
|
|
9690
|
+
@validate_call
|
|
9691
|
+
def reset_all_collection_expirations_without_preload_content(
|
|
9692
|
+
self,
|
|
9693
|
+
_request_timeout: Union[
|
|
9694
|
+
None,
|
|
9695
|
+
Annotated[StrictFloat, Field(gt=0)],
|
|
9696
|
+
Tuple[
|
|
9697
|
+
Annotated[StrictFloat, Field(gt=0)],
|
|
9698
|
+
Annotated[StrictFloat, Field(gt=0)]
|
|
9699
|
+
]
|
|
9700
|
+
] = None,
|
|
9701
|
+
_request_auth: Optional[Dict[StrictStr, Any]] = None,
|
|
9702
|
+
_content_type: Optional[StrictStr] = None,
|
|
9703
|
+
_headers: Optional[Dict[StrictStr, Any]] = None,
|
|
9704
|
+
_host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
|
|
9705
|
+
) -> RESTResponseType:
|
|
9706
|
+
"""Reset all collection expiry dates and inactivity intervals that have been set.
|
|
9707
|
+
|
|
9708
|
+
Reset any expiry dates and inactivity intervals that have been set for all collections (admin only). This will also reset any archived collections back to active.
|
|
9709
|
+
|
|
9710
|
+
:param _request_timeout: timeout setting for this request. If one
|
|
9711
|
+
number provided, it will be total request
|
|
9712
|
+
timeout. It can also be a pair (tuple) of
|
|
9713
|
+
(connection, read) timeouts.
|
|
9714
|
+
:type _request_timeout: int, tuple(int, int), optional
|
|
9715
|
+
:param _request_auth: set to override the auth_settings for an a single
|
|
9716
|
+
request; this effectively ignores the
|
|
9717
|
+
authentication in the spec for a single request.
|
|
9718
|
+
:type _request_auth: dict, optional
|
|
9719
|
+
:param _content_type: force content-type for the request.
|
|
9720
|
+
:type _content_type: str, Optional
|
|
9721
|
+
:param _headers: set to override the headers for a single
|
|
9722
|
+
request; this effectively ignores the headers
|
|
9723
|
+
in the spec for a single request.
|
|
9724
|
+
:type _headers: dict, optional
|
|
9725
|
+
:param _host_index: set to override the host_index for a single
|
|
9726
|
+
request; this effectively ignores the host_index
|
|
9727
|
+
in the spec for a single request.
|
|
9728
|
+
:type _host_index: int, optional
|
|
9729
|
+
:return: Returns the result object.
|
|
9730
|
+
""" # noqa: E501
|
|
9731
|
+
|
|
9732
|
+
_param = self._reset_all_collection_expirations_serialize(
|
|
9733
|
+
_request_auth=_request_auth,
|
|
9734
|
+
_content_type=_content_type,
|
|
9735
|
+
_headers=_headers,
|
|
9736
|
+
_host_index=_host_index
|
|
9737
|
+
)
|
|
9738
|
+
|
|
9739
|
+
_response_types_map: Dict[str, Optional[str]] = {
|
|
9740
|
+
'204': None,
|
|
9741
|
+
'401': "EndpointError",
|
|
9742
|
+
}
|
|
9743
|
+
response_data = self.api_client.call_api(
|
|
9744
|
+
*_param,
|
|
9745
|
+
_request_timeout=_request_timeout
|
|
9746
|
+
)
|
|
9747
|
+
return response_data.response
|
|
9748
|
+
|
|
9749
|
+
|
|
9750
|
+
def _reset_all_collection_expirations_serialize(
|
|
9751
|
+
self,
|
|
9752
|
+
_request_auth,
|
|
9753
|
+
_content_type,
|
|
9754
|
+
_headers,
|
|
9755
|
+
_host_index,
|
|
9756
|
+
) -> RequestSerialized:
|
|
9757
|
+
|
|
9758
|
+
_host = None
|
|
9759
|
+
|
|
9760
|
+
_collection_formats: Dict[str, str] = {
|
|
9761
|
+
}
|
|
9762
|
+
|
|
9763
|
+
_path_params: Dict[str, str] = {}
|
|
9764
|
+
_query_params: List[Tuple[str, str]] = []
|
|
9765
|
+
_header_params: Dict[str, Optional[str]] = _headers or {}
|
|
9766
|
+
_form_params: List[Tuple[str, str]] = []
|
|
9767
|
+
_files: Dict[
|
|
9768
|
+
str, Union[str, bytes, List[str], List[bytes], List[Tuple[str, bytes]]]
|
|
9769
|
+
] = {}
|
|
9770
|
+
_body_params: Optional[bytes] = None
|
|
9771
|
+
|
|
9772
|
+
# process the path parameters
|
|
9773
|
+
# process the query parameters
|
|
9774
|
+
# process the header parameters
|
|
9775
|
+
# process the form parameters
|
|
9776
|
+
# process the body parameter
|
|
9777
|
+
|
|
9778
|
+
|
|
9779
|
+
# set the HTTP header `Accept`
|
|
9780
|
+
if 'Accept' not in _header_params:
|
|
9781
|
+
_header_params['Accept'] = self.api_client.select_header_accept(
|
|
9782
|
+
[
|
|
9783
|
+
'application/json'
|
|
9784
|
+
]
|
|
9785
|
+
)
|
|
9786
|
+
|
|
9787
|
+
|
|
9788
|
+
# authentication setting
|
|
9789
|
+
_auth_settings: List[str] = [
|
|
9790
|
+
'bearerAuth'
|
|
9791
|
+
]
|
|
9792
|
+
|
|
9793
|
+
return self.api_client.param_serialize(
|
|
9794
|
+
method='POST',
|
|
9795
|
+
resource_path='/collections/reset_all_collection_expirations',
|
|
9796
|
+
path_params=_path_params,
|
|
9797
|
+
query_params=_query_params,
|
|
9798
|
+
header_params=_header_params,
|
|
9799
|
+
body=_body_params,
|
|
9800
|
+
post_params=_form_params,
|
|
9801
|
+
files=_files,
|
|
9802
|
+
auth_settings=_auth_settings,
|
|
9803
|
+
collection_formats=_collection_formats,
|
|
9804
|
+
_host=_host,
|
|
9805
|
+
_request_auth=_request_auth
|
|
9806
|
+
)
|
|
9807
|
+
|
|
9808
|
+
|
|
9809
|
+
|
|
9810
|
+
|
|
9562
9811
|
@validate_call
|
|
9563
9812
|
def reset_collection_prompt_settings(
|
|
9564
9813
|
self,
|
|
@@ -7082,7 +7082,7 @@ class PermissionsApi:
|
|
|
7082
7082
|
@validate_call
|
|
7083
7083
|
def remove_permission_from_role(
|
|
7084
7084
|
self,
|
|
7085
|
-
role_id: Annotated[StrictStr, Field(description="The unique identifier of
|
|
7085
|
+
role_id: Annotated[StrictStr, Field(description="The unique identifier of the role.")],
|
|
7086
7086
|
permission_name: Annotated[StrictStr, Field(description="The permission name.")],
|
|
7087
7087
|
_request_timeout: Union[
|
|
7088
7088
|
None,
|
|
@@ -7101,7 +7101,7 @@ class PermissionsApi:
|
|
|
7101
7101
|
|
|
7102
7102
|
Removes permission from a given role.
|
|
7103
7103
|
|
|
7104
|
-
:param role_id: The unique identifier of
|
|
7104
|
+
:param role_id: The unique identifier of the role. (required)
|
|
7105
7105
|
:type role_id: str
|
|
7106
7106
|
:param permission_name: The permission name. (required)
|
|
7107
7107
|
:type permission_name: str
|
|
@@ -7155,7 +7155,7 @@ class PermissionsApi:
|
|
|
7155
7155
|
@validate_call
|
|
7156
7156
|
def remove_permission_from_role_with_http_info(
|
|
7157
7157
|
self,
|
|
7158
|
-
role_id: Annotated[StrictStr, Field(description="The unique identifier of
|
|
7158
|
+
role_id: Annotated[StrictStr, Field(description="The unique identifier of the role.")],
|
|
7159
7159
|
permission_name: Annotated[StrictStr, Field(description="The permission name.")],
|
|
7160
7160
|
_request_timeout: Union[
|
|
7161
7161
|
None,
|
|
@@ -7174,7 +7174,7 @@ class PermissionsApi:
|
|
|
7174
7174
|
|
|
7175
7175
|
Removes permission from a given role.
|
|
7176
7176
|
|
|
7177
|
-
:param role_id: The unique identifier of
|
|
7177
|
+
:param role_id: The unique identifier of the role. (required)
|
|
7178
7178
|
:type role_id: str
|
|
7179
7179
|
:param permission_name: The permission name. (required)
|
|
7180
7180
|
:type permission_name: str
|
|
@@ -7228,7 +7228,7 @@ class PermissionsApi:
|
|
|
7228
7228
|
@validate_call
|
|
7229
7229
|
def remove_permission_from_role_without_preload_content(
|
|
7230
7230
|
self,
|
|
7231
|
-
role_id: Annotated[StrictStr, Field(description="The unique identifier of
|
|
7231
|
+
role_id: Annotated[StrictStr, Field(description="The unique identifier of the role.")],
|
|
7232
7232
|
permission_name: Annotated[StrictStr, Field(description="The permission name.")],
|
|
7233
7233
|
_request_timeout: Union[
|
|
7234
7234
|
None,
|
|
@@ -7247,7 +7247,7 @@ class PermissionsApi:
|
|
|
7247
7247
|
|
|
7248
7248
|
Removes permission from a given role.
|
|
7249
7249
|
|
|
7250
|
-
:param role_id: The unique identifier of
|
|
7250
|
+
:param role_id: The unique identifier of the role. (required)
|
|
7251
7251
|
:type role_id: str
|
|
7252
7252
|
:param permission_name: The permission name. (required)
|
|
7253
7253
|
:type permission_name: str
|
h2ogpte/rest_sync/api_client.py
CHANGED
|
@@ -90,7 +90,7 @@ class ApiClient:
|
|
|
90
90
|
self.default_headers[header_name] = header_value
|
|
91
91
|
self.cookie = cookie
|
|
92
92
|
# Set default User-Agent.
|
|
93
|
-
self.user_agent = 'OpenAPI-Generator/1.6.
|
|
93
|
+
self.user_agent = 'OpenAPI-Generator/1.6.44/python'
|
|
94
94
|
self.client_side_validation = configuration.client_side_validation
|
|
95
95
|
|
|
96
96
|
def __enter__(self):
|
|
@@ -503,7 +503,7 @@ class Configuration:
|
|
|
503
503
|
"OS: {env}\n"\
|
|
504
504
|
"Python Version: {pyversion}\n"\
|
|
505
505
|
"Version of the API: v1.0.0\n"\
|
|
506
|
-
"SDK Package Version: 1.6.
|
|
506
|
+
"SDK Package Version: 1.6.44".\
|
|
507
507
|
format(env=sys.platform, pyversion=sys.version)
|
|
508
508
|
|
|
509
509
|
def get_host_settings(self) -> List[HostSetting]:
|
|
@@ -32,7 +32,11 @@ class GlobalConfigurationItem(BaseModel):
|
|
|
32
32
|
can_overwrite: StrictBool
|
|
33
33
|
upper_bound: Optional[Union[StrictFloat, StrictInt]] = None
|
|
34
34
|
is_public: StrictBool
|
|
35
|
-
|
|
35
|
+
is_read_only: Optional[StrictBool] = None
|
|
36
|
+
is_encrypted: Optional[StrictBool] = None
|
|
37
|
+
description: Optional[StrictStr] = None
|
|
38
|
+
category: Optional[StrictStr] = None
|
|
39
|
+
__properties: ClassVar[List[str]] = ["key_name", "string_value", "value_type", "can_overwrite", "upper_bound", "is_public", "is_read_only", "is_encrypted", "description", "category"]
|
|
36
40
|
|
|
37
41
|
model_config = ConfigDict(
|
|
38
42
|
populate_by_name=True,
|
|
@@ -90,7 +94,11 @@ class GlobalConfigurationItem(BaseModel):
|
|
|
90
94
|
"value_type": obj.get("value_type"),
|
|
91
95
|
"can_overwrite": obj.get("can_overwrite"),
|
|
92
96
|
"upper_bound": obj.get("upper_bound"),
|
|
93
|
-
"is_public": obj.get("is_public")
|
|
97
|
+
"is_public": obj.get("is_public"),
|
|
98
|
+
"is_read_only": obj.get("is_read_only"),
|
|
99
|
+
"is_encrypted": obj.get("is_encrypted"),
|
|
100
|
+
"description": obj.get("description"),
|
|
101
|
+
"category": obj.get("category")
|
|
94
102
|
})
|
|
95
103
|
return _obj
|
|
96
104
|
|
|
@@ -17,20 +17,22 @@ import pprint
|
|
|
17
17
|
import re # noqa: F401
|
|
18
18
|
import json
|
|
19
19
|
|
|
20
|
-
from pydantic import BaseModel, ConfigDict, StrictStr
|
|
20
|
+
from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr
|
|
21
21
|
from typing import Any, ClassVar, Dict, List, Optional
|
|
22
22
|
from typing import Optional, Set
|
|
23
23
|
from typing_extensions import Self
|
|
24
24
|
|
|
25
25
|
class S3Credentials(BaseModel):
|
|
26
26
|
"""
|
|
27
|
-
The object with S3 credentials. If the object is not provided, only public buckets will be accessible.
|
|
27
|
+
The object with S3 credentials. If the object is not provided, only public buckets will be accessible. When use_irsa is true, access_key_id and secret_access_key are optional and the pod's service account will be used for authentication.
|
|
28
28
|
""" # noqa: E501
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
29
|
+
use_irsa: Optional[StrictBool] = Field(default=False, description="Enable IAM Roles for Service Accounts (IRSA) to authenticate using the pod's service account. When enabled, explicit credentials are not required.")
|
|
30
|
+
access_key_id: Optional[StrictStr] = Field(default=None, description="AWS access key ID. Not required when using IRSA.")
|
|
31
|
+
secret_access_key: Optional[StrictStr] = Field(default=None, description="AWS secret access key. Not required when using IRSA.")
|
|
32
|
+
session_token: Optional[StrictStr] = Field(default=None, description="AWS session token for temporary credentials.")
|
|
33
|
+
role_arn: Optional[StrictStr] = Field(default=None, description="The Amazon Resource Name (ARN) of IAM Role that will be utilized for accessing the S3 storage. When IRSA is enabled, this role will be assumed from the service account identity (role chaining). When IRSA is disabled, it requires specification of other credentials to identify an identity the role will be associated with.")
|
|
34
|
+
external_id: Optional[StrictStr] = Field(default=None, description="Optional security token for assuming cross-account roles. This is used to prevent the 'confused deputy' problem when a third party assumes a role in your account. Only required if the role's trust policy requires an external ID.")
|
|
35
|
+
__properties: ClassVar[List[str]] = ["use_irsa", "access_key_id", "secret_access_key", "session_token", "role_arn", "external_id"]
|
|
34
36
|
|
|
35
37
|
model_config = ConfigDict(
|
|
36
38
|
populate_by_name=True,
|
|
@@ -83,10 +85,12 @@ class S3Credentials(BaseModel):
|
|
|
83
85
|
return cls.model_validate(obj)
|
|
84
86
|
|
|
85
87
|
_obj = cls.model_validate({
|
|
88
|
+
"use_irsa": obj.get("use_irsa") if obj.get("use_irsa") is not None else False,
|
|
86
89
|
"access_key_id": obj.get("access_key_id"),
|
|
87
90
|
"secret_access_key": obj.get("secret_access_key"),
|
|
88
91
|
"session_token": obj.get("session_token"),
|
|
89
|
-
"role_arn": obj.get("role_arn")
|
|
92
|
+
"role_arn": obj.get("role_arn"),
|
|
93
|
+
"external_id": obj.get("external_id")
|
|
90
94
|
})
|
|
91
95
|
return _obj
|
|
92
96
|
|
|
@@ -17,7 +17,7 @@ import pprint
|
|
|
17
17
|
import re # noqa: F401
|
|
18
18
|
import json
|
|
19
19
|
|
|
20
|
-
from pydantic import BaseModel, ConfigDict, StrictStr
|
|
20
|
+
from pydantic import BaseModel, ConfigDict, Field, StrictStr
|
|
21
21
|
from typing import Any, ClassVar, Dict, List, Optional
|
|
22
22
|
from typing import Optional, Set
|
|
23
23
|
from typing_extensions import Self
|
|
@@ -30,7 +30,8 @@ class UserPermission(BaseModel):
|
|
|
30
30
|
name: StrictStr
|
|
31
31
|
description: Optional[StrictStr] = None
|
|
32
32
|
category: Optional[StrictStr] = None
|
|
33
|
-
|
|
33
|
+
dependencies: Optional[List[StrictStr]] = Field(default=None, description="List of permissions that this permission depends on.")
|
|
34
|
+
__properties: ClassVar[List[str]] = ["id", "name", "description", "category", "dependencies"]
|
|
34
35
|
|
|
35
36
|
model_config = ConfigDict(
|
|
36
37
|
populate_by_name=True,
|
|
@@ -86,7 +87,8 @@ class UserPermission(BaseModel):
|
|
|
86
87
|
"id": obj.get("id"),
|
|
87
88
|
"name": obj.get("name"),
|
|
88
89
|
"description": obj.get("description"),
|
|
89
|
-
"category": obj.get("category")
|
|
90
|
+
"category": obj.get("category"),
|
|
91
|
+
"dependencies": obj.get("dependencies")
|
|
90
92
|
})
|
|
91
93
|
return _obj
|
|
92
94
|
|
h2ogpte/session.py
CHANGED
|
@@ -149,6 +149,7 @@ class Session:
|
|
|
149
149
|
ssl_context=ssl_context,
|
|
150
150
|
open_timeout=self._open_timeout,
|
|
151
151
|
close_timeout=self._close_timeout,
|
|
152
|
+
max_size=5 * 1024 * 1024, # 5 MB limit for large responses
|
|
152
153
|
)
|
|
153
154
|
return self._connection
|
|
154
155
|
except (ConnectionClosedError, InvalidURI, InvalidHandshake) as e:
|
h2ogpte/session_async.py
CHANGED
|
@@ -478,6 +478,7 @@ class SessionAsync:
|
|
|
478
478
|
open_timeout=self._open_timeout,
|
|
479
479
|
close_timeout=self._close_timeout,
|
|
480
480
|
ssl=ssl_context,
|
|
481
|
+
max_size=5 * 1024 * 1024, # 5 MB limit for large responses
|
|
481
482
|
)
|
|
482
483
|
return self._websocket
|
|
483
484
|
except (ConnectionClosedError, InvalidURI, InvalidHandshake) as e:
|
h2ogpte/types.py
CHANGED
|
@@ -123,6 +123,8 @@ class ChatMessageFull(BaseModel):
|
|
|
123
123
|
type_list: Optional[List[ChatMessageMeta]] = []
|
|
124
124
|
has_references: bool
|
|
125
125
|
total_references: int
|
|
126
|
+
collection_id: Optional[str] = None
|
|
127
|
+
collection_name: Optional[str] = None
|
|
126
128
|
error: Optional[str] = None
|
|
127
129
|
|
|
128
130
|
|
|
@@ -382,6 +384,7 @@ class UserPermission(BaseModel):
|
|
|
382
384
|
name: str
|
|
383
385
|
description: Optional[str] = None
|
|
384
386
|
category: Optional[str] = None
|
|
387
|
+
dependencies: Optional[List[str]] = None
|
|
385
388
|
|
|
386
389
|
|
|
387
390
|
class UserRole(BaseModel):
|