mirror of
https://github.com/onyx-dot-app/onyx.git
synced 2026-10-23 03:42:59 -05:00
josvdwandhagen-danswer
50c17438d5
* ran bump-pydantic * replace root_validator with model_validator * mostly working. some alternate assistant error. changed root_validator and typing_extensions * working generation chat. changed type * replacing .dict with .model_dump * argument needed to bring model_dump up to parity with dict() * fix a fewremaining issues -- working with llama and gpt * updating requirements file * more requirement updates * more requirement updates * fix to make search work * return type fix: * half way tpyes change * fixes for mypy and pydantic: * endpoint fix * fix pydantic protected namespaces * it works! * removed unecessary None initializations * better logging * changed default values to empty lists * mypy fixes * fixed array defaulting --------- Co-authored-by: hagen-danswer <hagen@danswer.ai>
86 lines
2.8 KiB
Python
86 lines
2.8 KiB
Python
from uuid import UUID
|
|
|
|
from pydantic import BaseModel
|
|
from pydantic import Field
|
|
|
|
from danswer.db.models import DocumentSet as DocumentSetDBModel
|
|
from danswer.server.documents.models import ConnectorCredentialPairDescriptor
|
|
from danswer.server.documents.models import ConnectorSnapshot
|
|
from danswer.server.documents.models import CredentialSnapshot
|
|
|
|
|
|
class DocumentSetCreationRequest(BaseModel):
|
|
name: str
|
|
description: str
|
|
cc_pair_ids: list[int]
|
|
is_public: bool
|
|
# For Private Document Sets, who should be able to access these
|
|
users: list[UUID] = Field(default_factory=list)
|
|
groups: list[int] = Field(default_factory=list)
|
|
|
|
|
|
class DocumentSetUpdateRequest(BaseModel):
|
|
id: int
|
|
description: str
|
|
cc_pair_ids: list[int]
|
|
is_public: bool
|
|
# For Private Document Sets, who should be able to access these
|
|
users: list[UUID]
|
|
groups: list[int]
|
|
|
|
|
|
class CheckDocSetPublicRequest(BaseModel):
|
|
"""Note that this does not mean that the Document Set itself is to be viewable by everyone
|
|
Rather, this refers to the CC-Pairs in the Document Set, and if every CC-Pair is public
|
|
"""
|
|
|
|
document_set_ids: list[int]
|
|
|
|
|
|
class CheckDocSetPublicResponse(BaseModel):
|
|
is_public: bool
|
|
|
|
|
|
class DocumentSet(BaseModel):
|
|
id: int
|
|
name: str
|
|
description: str
|
|
cc_pair_descriptors: list[ConnectorCredentialPairDescriptor]
|
|
is_up_to_date: bool
|
|
contains_non_public: bool
|
|
is_public: bool
|
|
# For Private Document Sets, who should be able to access these
|
|
users: list[UUID]
|
|
groups: list[int]
|
|
|
|
@classmethod
|
|
def from_model(cls, document_set_model: DocumentSetDBModel) -> "DocumentSet":
|
|
return cls(
|
|
id=document_set_model.id,
|
|
name=document_set_model.name,
|
|
description=document_set_model.description,
|
|
contains_non_public=any(
|
|
[
|
|
not cc_pair.is_public
|
|
for cc_pair in document_set_model.connector_credential_pairs
|
|
]
|
|
),
|
|
cc_pair_descriptors=[
|
|
ConnectorCredentialPairDescriptor(
|
|
id=cc_pair.id,
|
|
name=cc_pair.name,
|
|
connector=ConnectorSnapshot.from_connector_db_model(
|
|
cc_pair.connector
|
|
),
|
|
credential=CredentialSnapshot.from_credential_db_model(
|
|
cc_pair.credential
|
|
),
|
|
)
|
|
for cc_pair in document_set_model.connector_credential_pairs
|
|
],
|
|
is_up_to_date=document_set_model.is_up_to_date,
|
|
is_public=document_set_model.is_public,
|
|
users=[user.id for user in document_set_model.users],
|
|
groups=[group.id for group in document_set_model.groups],
|
|
)
|