logs-py 1.14__py3-none-any.whl → 2.1__py3-none-any.whl

LOGS/Entities/LabNotebookEntryRelations.py

@@ -0,0 +1,81 @@
+from typing import TYPE_CHECKING, Optional
+
+from LOGS.Entity.EntityRelation import EntityRelation
+from LOGS.Entity.EntityRelations import EntityRelations
+
+if TYPE_CHECKING:
+    from LOGS.Entities.Dataset import Dataset
+    from LOGS.Entities.Document import Document
+    from LOGS.Entities.LabNotebookEntry import LabNotebookEntry
+    from LOGS.Entities.Person import Person
+    from LOGS.Entities.Project import Project
+    from LOGS.Entities.Sample import Sample
+
+
+class LabNotebookEntryRelations(EntityRelations):
+    """Relations of a LabNotebookEntry with other entities"""
+
+    _datasets: Optional[EntityRelation["Dataset"]] = None
+    _labNotebookEntries: Optional[EntityRelation["LabNotebookEntry"]] = None
+    _persons: Optional[EntityRelation["Person"]] = None
+    _samples: Optional[EntityRelation["Sample"]] = None
+    _projects: Optional[EntityRelation["Project"]] = None
+    _documents: Optional[EntityRelation["Document"]] = None
+
+    @property
+    def persons(self) -> Optional[EntityRelation["Person"]]:
+        return self._persons
+
+    @persons.setter
+    def persons(self, value):
+        from LOGS.Entities.Persons import Persons
+
+        self._persons = self._entityConverter(value, Persons)
+
+    @property
+    def documents(self) -> Optional[EntityRelation["Document"]]:
+        return self._documents
+
+    @documents.setter
+    def documents(self, value):
+        from LOGS.Entities.Documents import Documents
+
+        self._documents = self._entityConverter(value, Documents)
+
+    @property
+    def datasets(self) -> Optional[EntityRelation["Dataset"]]:
+        return self._datasets
+
+    @datasets.setter
+    def datasets(self, value):
+        from LOGS.Entities.Datasets import Datasets
+
+        self._datasets = self._entityConverter(value, Datasets)
+
+    @property
+    def labNotebookEntries(self) -> Optional[EntityRelation]:
+        return self._labNotebookEntries
+
+    @labNotebookEntries.setter
+    def labNotebookEntries(self, value):
+        self._labNotebookEntries = self.checkAndConvertNullable(
+            value, EntityRelation, "labNotebookEntries"
+        )
+
+    @property
+    def samples(self) -> Optional[EntityRelation["Sample"]]:
+        return self._samples
+
+    @samples.setter
+    def samples(self, value):
+        from LOGS.Entities.Samples import Samples
+
+        self._samples = self._entityConverter(value, Samples)
+
+    @property
+    def projects(self) -> Optional[EntityRelation]:
+        return self._projects
+
+    @projects.setter
+    def projects(self, value):
+        self._projects = self.checkAndConvertNullable(value, EntityRelation, "projects")

LOGS/Entities/LabNotebookEntryRequestParameter.py

@@ -1,12 +1,67 @@
 from dataclasses import dataclass
+from datetime import date, datetime
+from enum import Enum
 from typing import List, Optional
 
+from LOGS.Entities.IRelatedEntityRequest import IRelatedEntityRequest
 from LOGS.Entity.EntityRequestParameter import EntityRequestParameter
+from LOGS.Interfaces.ICreationRecord import ICreationRecordRequest
+from LOGS.Interfaces.IModificationRecord import IModificationRecordRequest
+from LOGS.Interfaces.ISoftDeletable import ISoftDeletableRequest
+
+
+class LabNotebookEntryOrder(Enum):
+    ID_ASC = "ID_ASC"
+    ID_DESC = "ID_DESC"
+    LAB_NOTEBOOK_ID_ASC = "LAB_NOTEBOOK_ID_ASC"
+    LAB_NOTEBOOK_ID_DESC = "LAB_NOTEBOOK_ID_DESC"
+    LAB_NOTEBOOK_NAME_ASC = "LAB_NOTEBOOK_NAME_ASC"
+    LAB_NOTEBOOK_NAME_DESC = "LAB_NOTEBOOK_NAME_DESC"
+    LAB_NOTEBOOK_EXPERIMENT_ID_ASC = "LAB_NOTEBOOK_EXPERIMENT_ID_ASC"
+    LAB_NOTEBOOK_EXPERIMENT_ID_DESC = "LAB_NOTEBOOK_EXPERIMENT_ID_DESC"
+    LAB_NOTEBOOK_EXPERIMENT_NAME_ASC = "LAB_NOTEBOOK_EXPERIMENT_NAME_ASC"
+    LAB_NOTEBOOK_EXPERIMENT_NAME_DESC = "LAB_NOTEBOOK_EXPERIMENT_NAME_DESC"
+    ENTRY_DATE_ASC = "ENTRY_DATE_ASC"
+    ENTRY_DATE_DESC = "ENTRY_DATE_DESC"
+    CREATED_ON_ASC = "CREATED_ON_ASC"
+    CREATED_ON_DESC = "CREATED_ON_DESC"
+    CREATED_BY_ASC = "CREATED_BY_ASC"
+    CREATED_BY_DESC = "CREATED_BY_DESC"
+    MODIFIED_ON_ASC = "MODIFIED_ON_ASC"
+    MODIFIED_ON_DESC = "MODIFIED_ON_DESC"
+    MODIFIED_BY_ASC = "MODIFIED_BY_ASC"
+    MODIFIED_BY_DESC = "MODIFIED_BY_DESC"
+    VERSION_ASC = "VERSION_ASC"
+    VERSION_DESC = "VERSION_DESC"
 
 
 @dataclass
-class LabNotebookEntryRequestParameter(EntityRequestParameter):
-    isSoftDeleted: Optional[bool] = None
+class LabNotebookEntryRequestParameter(
+    EntityRequestParameter[LabNotebookEntryOrder],
+    IRelatedEntityRequest,
+    ISoftDeletableRequest,
+    ICreationRecordRequest,
+    IModificationRecordRequest,
+):
+    includeContent: Optional[bool] = None
+
+    labNotebookExperimentIds: Optional[List[int]] = None
     datasetIds: Optional[List[int]] = None
+    mediaIds: Optional[List[int]] = None
     personIds: Optional[List[int]] = None
     sampleIds: Optional[List[int]] = None
+    projectIds: Optional[List[int]] = None
+    labNotebookIds: Optional[List[int]] = None
+    entryDateFrom: Optional[date] = None
+    entryDateTo: Optional[date] = None
+    createdFrom: Optional[datetime] = None
+    createdTo: Optional[datetime] = None
+    createdByIds: Optional[List[int]] = None
+    modifiedFrom: Optional[datetime] = None
+    modifiedTo: Optional[datetime] = None
+    modifiedByIds: Optional[List[int]] = None
+    orderBy: Optional[LabNotebookEntryOrder] = None
+    originalIds: Optional[List[int]] = None
+    versionIds: Optional[List[int]] = None
+    versions: Optional[List[int]] = None
+    searchTermFullText: Optional[str] = None

LOGS/Entities/Method.py

@@ -1,14 +1,28 @@
 from typing import Optional
 
 from LOGS.Auxiliary.Decorators import Endpoint
-from LOGS.Entity.EntityWithIntId import EntityWithIntId
+from LOGS.Entities.MethodRelations import MethodRelations
+from LOGS.Entity.EntityWithIntId import IEntityWithIntId
+from LOGS.Interfaces.ICreationRecord import ICreationRecord
+from LOGS.Interfaces.IModificationRecord import IModificationRecord
 from LOGS.Interfaces.INamedEntity import INamedEntity
+from LOGS.Interfaces.IRelatedEntity import IRelatedEntity
 from LOGS.Interfaces.IUniqueEntity import IUniqueEntity
 
 
 @Endpoint("methods")
-class Method(INamedEntity, EntityWithIntId, IUniqueEntity):
+class Method(
+    IEntityWithIntId,
+    INamedEntity,
+    IUniqueEntity,
+    ICreationRecord,
+    IModificationRecord,
+    IRelatedEntity[MethodRelations],
+):
+    _relationType = type(MethodRelations)
+
     _fullName: Optional[str] = None
+    _description: Optional[str] = None
 
     @property
     def fullName(self) -> Optional[str]:
@@ -17,3 +31,11 @@ class Method(INamedEntity, EntityWithIntId, IUniqueEntity):
     @fullName.setter
     def fullName(self, value):
         self._fullName = self.checkAndConvertNullable(value, str, "fullName")
+
+    @property
+    def description(self) -> Optional[str]:
+        return self._description
+
+    @description.setter
+    def description(self, value):
+        self._description = self.checkAndConvertNullable(value, str, "description")

LOGS/Entities/MethodRelations.py

@@ -0,0 +1,35 @@
+from typing import TYPE_CHECKING, Optional
+
+from LOGS.Entity.EntityRelation import EntityRelation
+from LOGS.Entity.EntityRelations import EntityRelations
+
+if TYPE_CHECKING:
+    from LOGS.Entities.Dataset import Dataset
+    from LOGS.Entities.Experiment import Experiment
+
+
+class MethodRelations(EntityRelations):
+    """Relations of a Method with other entities"""
+
+    _datasets: Optional[EntityRelation["Dataset"]] = None
+    _experiments: Optional[EntityRelation["Experiment"]] = None
+
+    @property
+    def datasets(self) -> Optional[EntityRelation["Dataset"]]:
+        return self._datasets
+
+    @datasets.setter
+    def datasets(self, value):
+        from LOGS.Entities.Datasets import Datasets
+
+        self._datasets = self._entityConverter(value, Datasets)
+
+    @property
+    def experiments(self) -> Optional[EntityRelation["Experiment"]]:
+        return self._experiments
+
+    @experiments.setter
+    def experiments(self, value):
+        from LOGS.Entities.Experiments import Experiments
+
+        self._experiments = self._entityConverter(value, Experiments)

LOGS/Entities/MethodRequestParameter.py

@@ -1,8 +1,42 @@
 from dataclasses import dataclass
+from enum import Enum
 
 from LOGS.Entity.EntityRequestParameter import EntityRequestParameter
+from LOGS.Interfaces.ICreationRecord import ICreatedByRequest
+from LOGS.Interfaces.IModificationRecord import IModificationRecord
+from LOGS.Interfaces.IPaginationRequest import IPaginationRequest
+
+
+class MethodOrder(Enum):
+    ID_ASC = "ID_ASC"
+    ID_DESC = "ID_DESC"
+    NAME_ASC = "NAME_ASC"
+    NAME_DESC = "NAME_DESC"
+    FULL_NAME_ASC = "FULL_NAME_ASC"
+    FULL_NAME_DESC = "FULL_NAME_DESC"
+    CREATED_ON_ASC = "CREATED_ON_ASC"
+    CREATED_ON_DESC = "CREATED_ON_DESC"
+    CREATED_BY_ASC = "CREATED_BY_ASC"
+    CREATED_BY_DESC = "CREATED_BY_DESC"
+    MODIFIED_ON_ASC = "MODIFIED_ON_ASC"
+    MODIFIED_ON_DESC = "MODIFIED_ON_DESC"
+    MODIFIED_BY_ASC = "MODIFIED_BY_ASC"
+    MODIFIED_BY_DESC = "MODIFIED_BY_DESC"
+
+
+# : GenericListRequestParameters<int, MethodSortingOptions>,
+#     IRelationParameters,
+#     IPaginationParameters,
+#     IPermissionParameters,
+#     ICreationRecordParameters,
+#     IModificationRecordParameters
 
 
 @dataclass
-class MethodRequestParameter(EntityRequestParameter):
+class MethodRequestParameter(
+    EntityRequestParameter[MethodOrder],
+    IPaginationRequest,
+    ICreatedByRequest,
+    IModificationRecord,
+):
     pass

LOGS/Entities/Origin.py

@@ -2,7 +2,7 @@ from typing import Optional
 from uuid import UUID
 
 from LOGS.Auxiliary.Decorators import Endpoint
-from LOGS.Entity.EntityWithIntId import EntityWithIntId
+from LOGS.Entity.EntityWithIntId import IEntityWithIntId
 from LOGS.Interfaces.ICreationRecord import ICreationRecord
 from LOGS.Interfaces.IModificationRecord import IModificationRecord
 from LOGS.Interfaces.INamedEntity import INamedEntity
@@ -10,7 +10,7 @@ from LOGS.LOGSConnection import LOGSConnection
 
 
 @Endpoint("origins")
-class Origin(INamedEntity, EntityWithIntId, ICreationRecord, IModificationRecord):
+class Origin(IEntityWithIntId, INamedEntity, IModificationRecord, ICreationRecord):
     _url: Optional[str]
     _uid: Optional[UUID]
 

LOGS/Entities/OriginRequestParameter.py

@@ -2,11 +2,11 @@ from dataclasses import dataclass
 from typing import List, Optional, Sequence, Union
 from uuid import UUID
 
-from LOGS.Entity.EntityRequestParameter import EntityRequestParameter
+from LOGS.Entity.EntityRequestParameter import DefaultOrder, EntityRequestParameter
+from LOGS.Interfaces.INamedEntity import INamedEntityRequest
 
 
 @dataclass
-class OriginRequestParameter(EntityRequestParameter):
-    names: Optional[List[str]] = None
+class OriginRequestParameter(EntityRequestParameter[DefaultOrder], INamedEntityRequest):
     urls: Optional[List[str]] = None
     uids: Optional[Sequence[Union[UUID, str]]] = None

LOGS/Entities/Person.py

@@ -1,20 +1,40 @@
+from enum import Enum
 from typing import List, Optional
 
 from LOGS.Auxiliary.Decorators import Endpoint
 from LOGS.Entities.PersonCategory import PersonCategory
 from LOGS.Entities.PersonRelations import PersonRelations
 from LOGS.Entities.Role import Role
-from LOGS.Entity.EntityWithIntId import EntityWithIntId
+from LOGS.Entity.EntityWithIntId import IEntityWithIntId
+from LOGS.Interfaces.ICreationRecord import ICreationRecord
+from LOGS.Interfaces.IModificationRecord import IModificationRecord
 from LOGS.Interfaces.INamedEntity import INamedEntity
+from LOGS.Interfaces.IRelatedEntity import IRelatedEntity
+from LOGS.Interfaces.ISoftDeletable import ISoftDeletable
 from LOGS.Interfaces.IUniqueEntity import IUniqueEntity
 from LOGS.LOGSConnection import LOGSConnection
 
 
+class PersonAccountState(Enum):
+    NoAccount = "NoAccount"
+    Enabled = "Enabled"
+    Disabled = "Disabled"
+
+
 @Endpoint("persons")
-class Person(INamedEntity, EntityWithIntId, IUniqueEntity):
+class Person(
+    IEntityWithIntId,
+    IRelatedEntity[PersonRelations],
+    INamedEntity,
+    IUniqueEntity,
+    ISoftDeletable,
+    ICreationRecord,
+    IModificationRecord,
+):
     _firstName: Optional[str]
     _lastName: Optional[str]
     _login: Optional[str]
+    _accountState: Optional[PersonAccountState]
     _salutation: Optional[str]
     _notes: Optional[str]
     _officePhone: Optional[str]
@@ -36,7 +56,8 @@ class Person(INamedEntity, EntityWithIntId, IUniqueEntity):
         self._firstName = None
         self._lastName = None
         self._login = None
-        self._salutation = " "
+        self._accountState = None
+        self._salutation = None
         self._notes = None
         self._officePhone = None
         self._email = None
@@ -58,6 +79,16 @@ class Person(INamedEntity, EntityWithIntId, IUniqueEntity):
     def login(self, value):
         self._login = self.checkAndConvertNullable(value, str, "login")
 
+    @property
+    def accountState(self) -> Optional[PersonAccountState]:
+        return self._accountState
+
+    @accountState.setter
+    def accountState(self, value):
+        self._accountState = self.checkAndConvertNullable(
+            value, PersonAccountState, "accountState"
+        )
+
     @property
     def firstName(self) -> Optional[str]:
         return self._firstName

LOGS/Entities/PersonRelations.py

@@ -1,22 +1,29 @@
 from typing import TYPE_CHECKING, Optional
 
-from LOGS.Entities.Datasets import Datasets
-from LOGS.Entities.Documents import Documents
 from LOGS.Entity.EntityRelation import EntityRelation
 from LOGS.Entity.EntityRelations import EntityRelations
 
 if TYPE_CHECKING:
     from LOGS.Entities.Dataset import Dataset
     from LOGS.Entities.Document import Document
+    from LOGS.Entities.LabNotebookEntry import LabNotebookEntry
     from LOGS.Entities.Sample import Sample
 
+    # public EntityRelation Documents { get; set; }
+    # public EntityRelation LabNotebooks { get; set; }
+    # public EntityRelation LabNotebookExperiments { get; set; }
+    # public EntityRelation LabNotebooksEntries { get; set; }
+    # public EntityRelation LabNotebooksEntryMentions { get; set; }
+
 
 class PersonRelations(EntityRelations):
     """Relations of a Person with other entities"""
 
-    _documents: Optional[EntityRelation["Document"]] = None
     _datasets: Optional[EntityRelation["Dataset"]] = None
     _samples: Optional[EntityRelation["Sample"]] = None
+    _documents: Optional[EntityRelation["Document"]] = None
+    _labNotebooksEntries: Optional[EntityRelation["LabNotebookEntry"]] = None
+    _labNotebooksEntryMentions: Optional[EntityRelation["LabNotebookEntry"]] = None
 
     @property
     def documents(self) -> Optional[EntityRelation["Document"]]:
@@ -24,6 +31,8 @@ class PersonRelations(EntityRelations):
 
     @documents.setter
     def documents(self, value):
+        from LOGS.Entities.Documents import Documents
+
         self._documents = self._entityConverter(value, Documents)
 
     @property
@@ -42,4 +51,28 @@ class PersonRelations(EntityRelations):
 
     @datasets.setter
     def datasets(self, value):
+        from LOGS.Entities.Datasets import Datasets
+
         self._datasets = self._entityConverter(value, Datasets)
+
+    @property
+    def labNotebooksEntries(self) -> Optional[EntityRelation["LabNotebookEntry"]]:
+        return self._labNotebooksEntries
+
+    @labNotebooksEntries.setter
+    def labNotebooksEntries(self, value):
+        from LOGS.Entities import LabNotebookEntries
+
+        self._labNotebooksEntries = self._entityConverter(value, LabNotebookEntries)
+
+    @property
+    def labNotebooksEntryMentions(self) -> Optional[EntityRelation["LabNotebookEntry"]]:
+        return self._labNotebooksEntryMentions
+
+    @labNotebooksEntryMentions.setter
+    def labNotebooksEntryMentions(self, value):
+        from LOGS.Entities import LabNotebookEntries
+
+        self._labNotebooksEntryMentions = self._entityConverter(
+            value, LabNotebookEntries
+        )

LOGS/Entities/PersonRequestParameter.py

@@ -1,19 +1,59 @@
 from dataclasses import dataclass
+from enum import Enum
 from typing import List, Optional
 
+from LOGS.Entities.IRelatedEntityRequest import IRelatedEntityRequest
 from LOGS.Entity.EntityRequestParameter import EntityRequestParameter
+from LOGS.Interfaces.ICreationRecord import ICreationRecordRequest
+from LOGS.Interfaces.IModificationRecord import IModificationRecordRequest
+from LOGS.Interfaces.ISoftDeletable import ISoftDeletableRequest
+
+
+class PersonOrder(Enum):
+    ID_ASC = "ID_ASC"
+    ID_DESC = "ID_DESC"
+    NAME_ASC = "NAME_ASC"
+    NAME_DESC = "NAME_DESC"
+    SALUTATION_ASC = "SALUTATION_ASC"
+    SALUTATION_DESC = "SALUTATION_DESC"
+    LAST_NAME_ASC = "LAST_NAME_ASC"
+    LAST_NAME_DESC = "LAST_NAME_DESC"
+    FIRST_NAME_ASC = "FIRST_NAME_ASC"
+    FIRST_NAME_DESC = "FIRST_NAME_DESC"
+    ORGANIZATION_ASC = "ORGANIZATION_ASC"
+    ORGANIZATION_DESC = "ORGANIZATION_DESC"
+    LOGIN_DISABLED_ASC = "LOGIN_DISABLED_ASC"
+    LOGIN_DISABLED_DESC = "LOGIN_DISABLED_DESC"
+    LOGIN_ASC = "LOGIN_ASC"
+    LOGIN_DESC = "LOGIN_DESC"
+    IS_SYSTEM_USER_ASC = "IS_SYSTEM_USER_ASC"
+    IS_SYSTEM_USER_DESC = "IS_SYSTEM_USER_DESC"
+    CREATED_ON_ASC = "CREATED_ON_ASC"
+    CREATED_ON_DESC = "CREATED_ON_DESC"
+    CREATED_BY_ASC = "CREATED_BY_ASC"
+    CREATED_BY_DESC = "CREATED_BY_DESC"
+    MODIFIED_ON_ASC = "MODIFIED_ON_ASC"
+    MODIFIED_ON_DESC = "MODIFIED_ON_DESC"
+    MODIFIED_BY_ASC = "MODIFIED_BY_ASC"
+    MODIFIED_BY_DESC = "MODIFIED_BY_DESC"
 
 
 @dataclass
-class PersonRequestParameter(EntityRequestParameter):
-    categoryId: Optional[int] = None
-    organizationId: Optional[int] = None
-    login: Optional[str] = None
-    firstName: Optional[str] = None
-    lastName: Optional[str] = None
-    documentIds: Optional[List[int]] = None
-    projectIds: Optional[List[int]] = None
-    datasetIds: Optional[List[int]] = None
-    sampleIds: Optional[List[int]] = None
+class PersonRequestParameter(
+    EntityRequestParameter[PersonOrder],
+    IRelatedEntityRequest,
+    ISoftDeletableRequest,
+    ICreationRecordRequest,
+    IModificationRecordRequest,
+):
+    personTagIds: Optional[List[int]] = None
+    personTags: Optional[List[str]] = None
     organizationIds: Optional[List[int]] = None
+    roleIds: Optional[List[int]] = None
+    documentIds: Optional[List[int]] = None
+    hasAccount: Optional[bool] = None
+    isAccountEnabled: Optional[bool] = None
+    logins: Optional[List[str]] = None
     emails: Optional[List[str]] = None
+    firstNames: Optional[List[str]] = None
+    lastNames: Optional[List[str]] = None

LOGS/Entities/Project.py

@@ -3,15 +3,28 @@ from typing import List, Optional
 from LOGS.Auxiliary.Decorators import Endpoint
 from LOGS.Entities.ProjectRelations import ProjectRelations
 from LOGS.Entities.ProjectUserPermission import ProjectUserPermission
-from LOGS.Entity.EntityWithIntId import EntityWithIntId
+from LOGS.Entity.EntityWithIntId import IEntityWithIntId
+from LOGS.Interfaces.ICreationRecord import ICreationRecord
+from LOGS.Interfaces.IModificationRecord import IModificationRecord
 from LOGS.Interfaces.INamedEntity import INamedEntity
 from LOGS.Interfaces.IOwnedEntity import IOwnedEntity
+from LOGS.Interfaces.IRelatedEntity import IRelatedEntity
 from LOGS.Interfaces.IUniqueEntity import IUniqueEntity
 from LOGS.LOGSConnection import LOGSConnection
 
 
 @Endpoint("projects")
-class Project(INamedEntity, EntityWithIntId, IUniqueEntity, IOwnedEntity):
+class Project(
+    IEntityWithIntId,
+    INamedEntity,
+    IRelatedEntity[ProjectRelations],
+    IUniqueEntity,
+    ICreationRecord,
+    IModificationRecord,
+    IOwnedEntity,
+):
+    _relationType = type(ProjectRelations)
+
     _notes: Optional[str]
     _tags: Optional[List[str]]
     _relations: Optional[ProjectRelations]

LOGS/Entities/ProjectRelations.py

@@ -17,6 +17,7 @@ class ProjectRelations(EntityRelations):
     _datasets: Optional[EntityRelation[Dataset]] = None
     _samples: Optional[EntityRelation[Sample]] = None
     _labNotebookEntries: Optional[EntityRelation] = None
+    _labNotebooksEntryMentions: Optional[EntityRelation] = None
 
     @property
     def documents(self) -> Optional[EntityRelation[Document]]:
@@ -51,3 +52,13 @@ class ProjectRelations(EntityRelations):
         self._labNotebookEntries = self.checkAndConvertNullable(
             value, EntityRelation, "labNotebookEntries"
         )
+
+    @property
+    def labNotebooksEntryMentions(self) -> Optional[EntityRelation]:
+        return self._labNotebooksEntryMentions
+
+    @labNotebooksEntryMentions.setter
+    def labNotebooksEntryMentions(self, value):
+        self._labNotebooksEntryMentions = self.checkAndConvertNullable(
+            value, EntityRelation, "labNotebooksEntryMentions"
+        )

LOGS/Entities/ProjectRequestParameter.py

@@ -1,12 +1,53 @@
 from dataclasses import dataclass
+from enum import Enum
 from typing import List, Optional
 
+from LOGS.Entities.IRelatedEntityRequest import IRelatedEntityRequest
 from LOGS.Entity.EntityRequestParameter import EntityRequestParameter
+from LOGS.Interfaces.ICreationRecord import ICreationRecordRequest
+from LOGS.Interfaces.IModificationRecord import IModificationRecordRequest
+from LOGS.Interfaces.INamedEntity import INamedEntityRequest
 from LOGS.Interfaces.IOwnedEntity import IOwnedEntityRequest
 
 
+class ProjectOrder(Enum):
+    ID_ASC = "ID_ASC"
+    ID_DESC = "ID_DESC"
+    NAME_ASC = "NAME_ASC"
+    NAME_DESC = "NAME_DESC"
+    DATASET_COUNT_ASC = "DATASET_COUNT_ASC"
+    DATASET_COUNT_DESC = "DATASET_COUNT_DESC"
+    SAMPLE_COUNT_ASC = "SAMPLE_COUNT_ASC"
+    SAMPLE_COUNT_DESC = "SAMPLE_COUNT_DESC"
+    DOCUMENT_COUNT_ASC = "DOCUMENT_COUNT_ASC"
+    DOCUMENT_COUNT_DESC = "DOCUMENT_COUNT_DESC"
+    LAB_NOTEBOOK_COUNT_ASC = "LAB_NOTEBOOK_COUNT_ASC"
+    LAB_NOTEBOOK_COUNT_DESC = "LAB_NOTEBOOK_COUNT_DESC"
+    CREATED_ON_ASC = "CREATED_ON_ASC"
+    CREATED_ON_DESC = "CREATED_ON_DESC"
+    CREATED_BY_ASC = "CREATED_BY_ASC"
+    CREATED_BY_DESC = "CREATED_BY_DESC"
+    MODIFIED_ON_ASC = "MODIFIED_ON_ASC"
+    MODIFIED_ON_DESC = "MODIFIED_ON_DESC"
+    MODIFIED_BY_ASC = "MODIFIED_BY_ASC"
+    MODIFIED_BY_DESC = "MODIFIED_BY_DESC"
+
+
 @dataclass
-class ProjectRequestParameter(EntityRequestParameter, IOwnedEntityRequest):
-    names: Optional[List[str]] = None
+class ProjectRequestParameter(
+    EntityRequestParameter[ProjectOrder],
+    IRelatedEntityRequest,
+    IOwnedEntityRequest,
+    ICreationRecordRequest,
+    IModificationRecordRequest,
+    INamedEntityRequest,
+):
+    typeIds: Optional[List[str]] = None
     notes: Optional[str] = None
-    tags: Optional[List[str]] = None
+    projectTagIds: Optional[List[int]] = None
+    projectTags: Optional[List[str]] = None
+    personIds: Optional[List[int]] = None
+    datasetIds: Optional[List[int]] = None
+    mediaIds: Optional[List[int]] = None
+    sampleIds: Optional[List[int]] = None
+    documentIds: Optional[List[int]] = None