splight-lib 5.10.4__tar.gz → 5.11.1.dev0__tar.gz

{splight_lib-5.10.4 → splight_lib-5.11.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-lib
-Version: 5.10.4
+Version: 5.11.1.dev0
 Summary: Splight Library
 Author: Splight Dev
 Author-email: dev@splight-ae.com

{splight_lib-5.10.4 → splight_lib-5.11.1.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "splight-lib"
-version = "5.10.4"
+version = "5.11.1dev0"
 description = "Splight Library"
 authors = ["Splight Dev <dev@splight-ae.com>"]
 readme = "README.md"

{splight_lib-5.10.4 → splight_lib-5.11.1.dev0}/splight_lib/client/database/classmap.py

@@ -12,7 +12,7 @@ MODEL_NAME_MAP = {
     "attribute": f"{ENGINE_PREFIX}/attributes/",
     "metadata": f"{ENGINE_PREFIX}/metadata/",
     "chart": f"{ENGINE_PREFIX}/dashboard/charts/",
-    "chartitem": f"{ENGINE_PREFIX}/dashboard/chartitems/",
+    "chartitem": f"{ENGINE_PREFIX}/dashboard/items/",
     "component": f"{ENGINE_PREFIX}/component/components/",
     "componentobject": f"{ENGINE_PREFIX}/component/objects/",
     "dashboard": f"{ENGINE_PREFIX}/dashboard/dashboards/",
@@ -24,9 +24,12 @@ MODEL_NAME_MAP = {
     "secret": f"{ENGINE_PREFIX}/secrets/",
     "setpoint": f"{ENGINE_PREFIX}/setpoints/",
     "solution": f"{ENGINE_PREFIX}/solution/solutions/",
+    "server": f"{ENGINE_PREFIX}/server/servers/",
     "tab": f"{ENGINE_PREFIX}/dashboard/tabs/",
     "hubsolution": f"{HUB_PREFIX}/solution/solutions/",
     "hubsolutionversion": f"{HUB_PREFIX}/solution/versions/",
+    "hubserver": f"{HUB_PREFIX}/server/servers/",
+    "hubserverversion": f"{HUB_PREFIX}/server/versions/",
 }
 
 CUSTOM_PATHS_MAP = {
@@ -34,4 +37,5 @@ CUSTOM_PATHS_MAP = {
     "get-asset-attribute": "{prefix}/assets/{asset}/get-attribute/",
     "decrypt-secret": "{prefix}/secrets/decrypt/",
     "routine-status": "{prefix}/component/routines/{routine}/update_status/",
+    "server-status": "{prefix}/server/servers/{server}/update-status/",
 }

{splight_lib-5.10.4 → splight_lib-5.11.1.dev0}/splight_lib/client/database/remote_client.py

@@ -211,9 +211,13 @@ class RemoteDatabaseClient(AbstractDatabaseClient, AbstractRemoteClient):
         ------
         InvalidModelName thrown when the model name is not correct.
         """
-        if resource_name.lower() not in ["file", "hubsolutionversion"]:
+        if resource_name.lower() not in [
+            "file",
+            "hubsolutionversion",
+            "hubserverversion",
+        ]:
             raise InvalidModel(
-                "Only files and hub solution can be downloaded."
+                "Only files, hub solution and hub servers can be downloaded."
             )
         api_path = self._get_api_path(resource_name)
         resource_id = instance.get("id")

{splight_lib-5.10.4 → splight_lib-5.11.1.dev0}/splight_lib/logging/_internal.py

@@ -24,6 +24,7 @@ class LogTags(UppercaseStrEnum):
     DATABASE = auto()
     DATALAKE = auto()
     CACHE = auto()
+    SERVER = auto()
 
 
 # don't used now

{splight_lib-5.10.4 → splight_lib-5.11.1.dev0}/splight_lib/models/__init__.py

@@ -22,10 +22,12 @@ from splight_lib.models.datalake import DataRequest, PipelineStep, Trace
 from splight_lib.models.file import File
 from splight_lib.models.function import Function, FunctionItem, QueryFilter
 from splight_lib.models.hub import HubComponent
+from splight_lib.models.hub_server import HubServer
 from splight_lib.models.hub_solution import HubSolution
 from splight_lib.models.metadata import Metadata
 from splight_lib.models.native import Boolean, Number, String
 from splight_lib.models.secret import Secret
+from splight_lib.models.server import Server
 from splight_lib.models.solution import Solution
 from splight_lib.models.tag import Tag
 
@@ -53,12 +55,14 @@ __all__ = [
     FunctionItem,
     HubSolution,
     HubComponent,
+    HubServer,
     QueryFilter,
     Metadata,
     Number,
     PipelineStep,
     RoutineEvaluation,
     Secret,
+    Server,
     SetPoint,
     Solution,
     String,

{splight_lib-5.10.4 → splight_lib-5.11.1.dev0}/splight_lib/models/component.py

@@ -1,12 +1,10 @@
 import re
 import warnings
 from abc import ABC, abstractmethod
-from datetime import datetime
 from enum import auto
 from typing import Any, ClassVar, Dict, List, Literal, Optional, Type, Union
 
 from pydantic import (
-    AnyUrl,
     BaseModel,
     Field,
     PrivateAttr,
@@ -17,7 +15,6 @@ from pydantic import (
 from strenum import LowercaseStrEnum, PascalCaseStrEnum
 
 from splight_lib.constants import DESCRIPTION_MAX_LENGTH
-from splight_lib.execution.scheduling import Crontab
 from splight_lib.models.asset import Asset
 from splight_lib.models.attribute import Attribute
 from splight_lib.models.data_address import DataAddresses as DLDataAddress
@@ -26,6 +23,7 @@ from splight_lib.models.datalake_base import SplightDatalakeBaseModel
 from splight_lib.models.exceptions import InvalidObjectInstance
 from splight_lib.models.file import File
 from splight_lib.models.secret import Secret
+from splight_lib.models.variable_types import CUSTOM_TYPES, NATIVE_TYPES
 
 warnings.filterwarnings("ignore", category=RuntimeWarning)
 
@@ -211,19 +209,6 @@ class Component(SplightDatabaseBaseModel):
     routines: List[Routine] = []
 
 
-NATIVE_TYPES = {
-    "int": int,
-    "bool": bool,
-    "str": str,
-    "float": float,
-    "datetime": datetime,
-    "url": AnyUrl,
-}
-
-CUSTOM_TYPES = {
-    "crontab": Crontab,
-}
-
 DATABASE_TYPES = {
     "Component": Component,
     "Asset": Asset,

splight_lib-5.11.1.dev0/splight_lib/models/dashboard.py

@@ -0,0 +1,98 @@
+from enum import auto
+from typing import Annotated, Any
+
+from pydantic import BaseModel, Field
+from strenum import UppercaseStrEnum
+
+from splight_lib.constants import DESCRIPTION_MAX_LENGTH
+from splight_lib.models.database_base import (
+    ResourceSummary,
+    SplightDatabaseBaseModel,
+)
+
+
+class ChartItemType(UppercaseStrEnum):
+    QUERY = auto()
+    EXPRESSION = auto()
+
+
+class Filter(SplightDatabaseBaseModel):
+    id: str | None = None
+    chart_item: str
+    operator: str | None = None
+    key: str | None = None
+    value: str | None = None
+    label: str | None = None
+
+
+class AdvancedFilter(SplightDatabaseBaseModel):
+    id: str | None = None
+    chart_item: str
+    operator: str | None = None
+    key: str | None = None
+    field: str | None = None
+    value: str | None = None
+
+
+class ChartItem(BaseModel):
+    id: str | None = None
+    type: ChartItemType = ChartItemType.QUERY
+    ref_id: str
+    # chart: str | None = None
+    label: str
+    order: int | None = None
+    color: str | None = None
+    hidden: bool = False
+    query_filter_asset: ResourceSummary | None = None
+    query_filter_attribute: ResourceSummary | None = None
+    query_group_unit: str | None = None
+    query_group_function: str | None = None
+    query_sort_field: str | None = None
+    query_sort_direction: int | None = -1
+    query_limit: int = 10000
+    query_plain: str = ""
+    position_x: int | None = None
+    position_y: int | None = None
+    expression: str | None = None
+    expression_plain: str | None = None
+
+
+class Chart(SplightDatabaseBaseModel):
+    id: str | None = None
+    name: str
+    description: Annotated[
+        str | None, Field(max_length=DESCRIPTION_MAX_LENGTH)
+    ] = None
+    items: list[ChartItem] | None = None
+    tab: str
+    position_x: int | None = None
+    position_y: int | None = None
+    height: int | None = 28
+    width: int | None = 80
+    min_height: int | None = 14
+    min_width: int | None = 14
+    type: str | None = None
+    timestamp_gte: str | None = None
+    timestamp_lte: str | None = None
+    refresh_interval: str | None = None
+    relative_window_time: str | None = None
+    y_axis_max_limit: int | None = None
+    y_axis_min_limit: int | None = None
+    config: dict[str, Any] | None = None
+    chart_items: list[ChartItem] = []
+
+
+class Tab(SplightDatabaseBaseModel):
+    id: str | None = None
+    name: str
+    charts: list[Chart] | None = None
+    order: int | None = None
+    dashboard: str
+
+
+class Dashboard(SplightDatabaseBaseModel):
+    id: str | None = None
+    name: str
+    description: str | None = Field(
+        default=None, max_length=DESCRIPTION_MAX_LENGTH
+    )

{splight_lib-5.10.4 → splight_lib-5.11.1.dev0}/splight_lib/models/exceptions.py

@@ -66,6 +66,15 @@ class InvalidArgument(Exception):
     pass
 
 
+class InvalidServerConfigType(Exception):
+    def __init__(self, name: str, type_: str):
+        msg = (
+            f"Config parameter {name} has an invalid type {type_}. The only "
+            "valid types are native and 'File'"
+        )
+        super().__init__(msg)
+
+
 class TraceAlreadyExistsError(Exception):
     def __init__(self, ref_id: str):
         msg = f"Trace with ref_id {ref_id} already exists"

splight_lib-5.11.1.dev0/splight_lib/models/hub_server.py

@@ -0,0 +1,120 @@
+import os
+from glob import glob
+from tempfile import NamedTemporaryFile
+from typing import Annotated, Self
+
+import py7zr
+from pydantic import BaseModel, Field
+
+from splight_lib.constants import DESCRIPTION_MAX_LENGTH
+from splight_lib.models.component import InputParameter
+from splight_lib.models.database_base import (
+    FilePath,
+    PrivacyPolicy,
+    SplightDatabaseBaseModel,
+)
+from splight_lib.utils.hub import (
+    COMPRESSION_TYPE,
+    README_FILE_1,
+    RUN_FILE,
+    SPEC_FILE,
+    get_ignore_pathspec,
+    get_spec,
+)
+
+
+class Port(BaseModel):
+    name: str | None = None
+    protocol: str = "tcp"
+    internal_port: int
+    exposed_port: int
+
+
+class HubServer(SplightDatabaseBaseModel):
+    id: str | None = None
+    name: str
+    version: str
+    description: Annotated[
+        str | None, Field(max_length=DESCRIPTION_MAX_LENGTH)
+    ] = None
+    tags: Annotated[list[str] | None, Field()] = []
+    privacy_policy: PrivacyPolicy = PrivacyPolicy.PUBLIC
+
+    config: list[InputParameter] = []
+    ports: list[Port] = []
+    environment: list[dict[str, str]] = []
+
+    @classmethod
+    def upload(cls, path: FilePath, image_file: str) -> Self:
+        db_client = cls._SplightDatabaseBaseModel__get_database_client()
+        image_path = os.path.join(path, image_file)
+        spec = get_spec(path)
+        name = spec.get("name")
+        version = spec.get("version")
+
+        raw_hub_server = db_client.get(
+            resource_name=cls.__name__,
+            name=name,
+            version=version,
+        )
+        server = cls.model_validate(spec)
+        if raw_hub_server:
+            old_hub_server = cls.model_validate(raw_hub_server[0])
+            server.id = old_hub_server.id
+
+        server.save()
+
+        file_name = f"{name}-{version}.{COMPRESSION_TYPE}"
+        ignore_pathspec = get_ignore_pathspec(path)
+        versioned_path = f"{name}-{version}"
+        readme_path = os.path.join(path, README_FILE_1)
+        for req_file in [SPEC_FILE, RUN_FILE, README_FILE_1]:
+            if not os.path.exists(os.path.join(path, req_file)):
+                raise FileNotFoundError(f"Required file not found: {req_file}")
+        with py7zr.SevenZipFile(file_name, "w") as archive:
+            all_files = glob(f"{path}/**", recursive=True)
+            for filepath in all_files:
+                if ignore_pathspec and ignore_pathspec.match_file(filepath):
+                    continue
+                if os.path.isdir(filepath):
+                    continue
+                if image_file in filepath:
+                    continue
+                rel_filename = os.path.relpath(filepath, path)
+                new_filepath = os.path.join(versioned_path, rel_filename)
+                archive.write(filepath, new_filepath)
+
+        data = server.model_dump()
+        try:
+            db_client.upload(
+                "hubserverversion",
+                instance=data,
+                file_path=file_name,
+                type_="source",
+            )
+            db_client.upload(
+                "hubserverversion",
+                instance=data,
+                file_path=readme_path,
+                type_="readme",
+            )
+            db_client.upload(
+                "hubserverversion",
+                instance=data,
+                file_path=image_path,
+                type_="image",
+            )
+        except Exception as exc:
+            raise exc
+        finally:
+            if os.path.exists(file_name):
+                os.remove(file_name)
+        return server
+
+    def download(self) -> NamedTemporaryFile:
+        db_client = self._SplightDatabaseBaseModel__get_database_client()
+        return db_client.download(
+            resource_name="hubserverversion",
+            instance=self.model_dump(),
+            type_="source",
+        )

splight_lib-5.11.1.dev0/splight_lib/models/server.py

@@ -0,0 +1,195 @@
+import re
+from collections import namedtuple
+from enum import auto
+from typing import Any, NamedTuple
+
+from pydantic import BaseModel, Field, computed_field
+from strenum import LowercaseStrEnum, PascalCaseStrEnum
+
+from splight_lib.models.database_base import SplightDatabaseBaseModel
+from splight_lib.models.exceptions import (
+    InvalidArgument,
+    InvalidServerConfigType,
+)
+from splight_lib.models.file import File
+from splight_lib.models.hub_server import HubServer
+from splight_lib.models.secret import Secret
+from splight_lib.models.variable_types import CUSTOM_TYPES, NATIVE_TYPES
+
+# warnings.filterwarnings("ignore", category=RuntimeWarning)
+
+DATABASE_TYPES = {
+    "File": File,
+}
+
+DB_MODEL_TYPE_MAPPING = {
+    **CUSTOM_TYPES,
+    **NATIVE_TYPES,
+    **DATABASE_TYPES,
+}
+
+
+def get_field_value(field: dict):
+    field_multiple = field.get("multiple", False)
+    field_type = field.get("type")
+    field_value = field.get("value")
+
+    if not field_value:
+        return [] if field_multiple else None
+
+    if field_type in NATIVE_TYPES:
+        value = (
+            field_value
+            if not isinstance(field_value, str)
+            else parse_variable_string(field_value)
+        )
+    elif field.type in CUSTOM_TYPES:
+        value = CUSTOM_TYPES.get(field.type).from_string(field.value)
+    elif field_type in DATABASE_TYPES:
+        model_class = DATABASE_TYPES[field_type]
+        value = (
+            model_class.retrieve(field_value)
+            if not field_multiple
+            else [model_class.retrieve(item) for item in field_value]
+        )
+    return value
+
+
+def get_model_class(config: BaseModel, name: str) -> NamedTuple:
+    config_class = namedtuple(name, [x.name for x in config])
+    return config_class
+
+
+def load_server_config(
+    config: list[dict], config_class: NamedTuple
+) -> NamedTuple:
+    config_dict = {}
+    for item in config:
+        if item["type"] not in DB_MODEL_TYPE_MAPPING:
+            raise InvalidServerConfigType(item["name"], item["type"])
+        config_dict.update({item["name"]: get_field_value(item)})
+    config = config_class(**config_dict)
+    return config
+
+
+def validate_in_range(value: int, min_value: int, max_value: int) -> None:
+    if not (min_value <= value <= max_value):
+        raise ValueError(
+            f"{value} is out of valid range ({min_value}-{max_value})"
+        )
+
+
+def validate_protocol(protocol: str, valid_protocols: list[str]) -> None:
+    if protocol not in valid_protocols:
+        raise ValueError(
+            f"Protocol {protocol} is not valid. Must be 'tcp' or 'udp'"
+        )
+
+
+def load_server_ports(
+    ports: list[dict], model_class: NamedTuple
+) -> namedtuple:
+    ports_dict = {}
+    for port in ports:
+        validate_in_range(int(port["internal_port"]), 0, 65535)
+        validate_in_range(int(port["exposed_port"]), 0, 65535)
+        validate_protocol(port["protocol"], ["tcp", "udp"])
+        ports_dict.update({port["name"]: port})
+    resources = model_class(**ports_dict)
+    return resources
+
+
+def load_server_env_vars(env_vars: list[dict]) -> namedtuple:
+    ntuple = namedtuple("EnvVars", ["name", "value"])
+    return [ntuple(**env_var) for env_var in env_vars]
+
+
+class ServerStatus(PascalCaseStrEnum):
+    RUNNING = auto()
+    FAILED = auto()
+    SUCCEEDED = auto()
+    PENDING = auto()
+    START_REQUESTED = auto()
+    STOP_REQUESTED = auto()
+    STOPPED = auto()
+    UNKNOWN = auto()
+
+
+class PrivacyPolicy(LowercaseStrEnum):
+    PUBLIC = auto()
+    PRIVATE = auto()
+
+
+class Server(SplightDatabaseBaseModel):
+    id: str | None = None
+    name: str | None = None
+    version: str
+    hub_server: HubServer
+    raw_config: list[dict] = Field(alias="config")
+    raw_ports: list[dict] = Field(alias="ports")
+    raw_env_vars: list[dict] = Field(alias="env_vars")
+
+    def model_dump(self, *args, **kwargs):
+        kwargs.update({"by_alias": True})
+        return super().model_dump(*args, **kwargs)
+
+    def model_dump_json(self, *args, **kwargs):
+        kwargs.update({"by_alias": True})
+        return super().model_dump_json(*args, **kwargs)
+
+    @computed_field(alias="parsed_config")
+    @property
+    def config(self) -> NamedTuple:
+        model_class = get_model_class(self.hub_server.config, "Config")
+        config = load_server_config(self.raw_config, model_class)
+        return config
+
+    @computed_field(alias="parsed_ports")
+    @property
+    def ports(self) -> NamedTuple:
+        model_class = get_model_class(self.hub_server.ports, "Ports")
+        ports = load_server_ports(self.raw_ports, model_class)
+        return ports
+
+    @computed_field(alias="parsed_env_vars")
+    @property
+    def env_vars(self) -> NamedTuple:
+        env_vars = load_server_env_vars(self.raw_env_vars)
+        return env_vars
+
+    def update_config(self, **kwargs: dict) -> None:
+        valid_params = [x["name"] for x in self.raw_config]
+        for key, value in kwargs.items():
+            if key not in valid_params:
+                raise InvalidArgument(
+                    (
+                        f"Got invalid parameter {key}. Valid config parameters "
+                        f"are {valid_params}"
+                    )
+                )
+            for item in self.raw_config:
+                if item["name"] == key:
+                    item["value"] = value
+                    break
+
+    def update_status(self, status: ServerStatus) -> None:
+        _ = self._db_client.operate(
+            resource_name="server-status",
+            instance={
+                "server": self.id,
+                "deployment_status": status,
+            },
+        )
+
+
+def parse_variable_string(raw_value: str | None) -> Any:
+    if raw_value is None:
+        return ""
+    pattern = re.compile(r"^\$\{\{(\w+)\.(\w+)\}\}$")
+    match = pattern.search(raw_value)
+    if not match:
+        return raw_value
+    _, secret_name = match.groups()
+    # TODO: handle errors (not found or not allowed)
+    secret = Secret.decrypt(name=secret_name)
+    return secret.value

{splight_lib-5.10.4 → splight_lib-5.11.1.dev0}/splight_lib/models/solution.py

@@ -1,7 +1,7 @@
 from collections import namedtuple
 from typing import NamedTuple, Optional
 
-from pydantic import Field, computed_field
+from pydantic import BaseModel, Field, computed_field
 
 from splight_lib.models.asset import Asset
 from splight_lib.models.database_base import SplightDatabaseBaseModel
@@ -21,7 +21,7 @@ CAST_TO = {
 }
 
 
-def get_model_class(config: list[dict], name: str) -> NamedTuple:
+def get_model_class(config: BaseModel, name: str) -> NamedTuple:
     config_class = namedtuple(name, [x.name for x in config])
     return config_class
 

splight_lib-5.11.1.dev0/splight_lib/models/variable_types.py

@@ -0,0 +1,18 @@
+from datetime import datetime
+
+from pydantic import AnyUrl
+
+from splight_lib.execution.scheduling import Crontab
+
+NATIVE_TYPES = {
+    "int": int,
+    "bool": bool,
+    "str": str,
+    "float": float,
+    "datetime": datetime,
+    "url": AnyUrl,
+}
+
+CUSTOM_TYPES = {
+    "crontab": Crontab,
+}

splight_lib-5.11.1.dev0/splight_lib/server/__init__.py

@@ -0,0 +1,5 @@
+from splight_lib.server.server import ServerLoader
+
+__all__ = [
+    ServerLoader,
+]

splight_lib-5.11.1.dev0/splight_lib/server/exceptions.py

@@ -0,0 +1,3 @@
+class MissingInstanceEnvVar(Exception):
+    def __init__(self, env_var: str):
+        super().__init__(f"Missing environment variable: {env_var}")

splight_lib-5.11.1.dev0/splight_lib/server/server.py

@@ -0,0 +1,15 @@
+import os
+
+from splight_lib.models import Server
+from splight_lib.server.exceptions import MissingInstanceEnvVar
+
+ENV_VAR = "SPLIGHT_SERVER_ID"
+
+
+class ServerLoader:
+    @classmethod
+    def from_env(cls) -> Server:
+        if not (instance_id := os.environ.get(ENV_VAR)):
+            raise MissingInstanceEnvVar(ENV_VAR)
+        server = Server.retrieve(instance_id)
+        return server

{splight_lib-5.10.4 → splight_lib-5.11.1.dev0}/splight_lib/solution/solution.py

@@ -15,7 +15,7 @@ class SolutionLoader:
     def from_env(cls) -> Solution:
         if not (str_instance := os.environ.get(ENV_VAR)):
             raise MissingInstanceEnvVar(ENV_VAR)
-        str_instance = os.environ.get("INSTANCE_AS_STR", "")
+        str_instance = os.environ.get(ENV_VAR, "")
         instance = json.loads(str_instance)
         if not (instance_id := instance.get("id")):
             raise MissingInstanceId()

{splight_lib-5.10.4 → splight_lib-5.11.1.dev0}/splight_lib/utils/hub.py

@@ -7,6 +7,7 @@ import pathspec
 SPLIGHT_IGNORE = ".splightignore"
 COMPRESSION_TYPE = "7z"
 SPEC_FILE = "spec.json"
+RUN_FILE = "run.sh"
 README_FILE_1 = "README.md"
 README_FILE_2 = "README"
 

splight_lib-5.10.4/splight_lib/models/dashboard.py

@@ -1,93 +0,0 @@
-from typing import Any, Dict, List, Optional
-
-from pydantic import Field
-
-from splight_lib.constants import DESCRIPTION_MAX_LENGTH
-from splight_lib.models.database_base import SplightDatabaseBaseModel
-
-
-class Filter(SplightDatabaseBaseModel):
-    id: Optional[str] = None
-    chart_item: str
-    operator: Optional[str] = None
-    key: Optional[str] = None
-    value: Optional[str] = None
-    label: Optional[str] = None
-
-
-class AdvancedFilter(SplightDatabaseBaseModel):
-    id: Optional[str] = None
-    chart_item: str
-    operator: Optional[str] = None
-    key: Optional[str] = None
-    field: Optional[str] = None
-    value: Optional[str] = None
-
-
-class ChartItem(SplightDatabaseBaseModel):
-    id: Optional[str] = None
-    chart: str
-    label: str
-    order: Optional[int] = None
-    color: Optional[str] = None
-    position_x: Optional[str] = None
-    position_y: Optional[str] = None
-    width: Optional[str] = None
-    height: Optional[str] = None
-    split_by: Optional[str] = None
-    aggregate_criteria: Optional[str] = None
-    aggregate_period: Optional[str] = None
-    source: Optional[str] = None
-    source_label: Optional[str] = None
-    source_type: Optional[str] = None
-    source_component_label: Optional[str] = None
-    source_component_id: Optional[str] = None
-    output_format: Optional[str] = None
-    target: Optional[str] = None
-    old_source: Optional[str] = None
-    old_source_label: Optional[str] = None
-    filters: Optional[List[Filter]] = None
-    advanced_filters: Optional[List[AdvancedFilter]] = None
-    query_params: Optional[str] = None
-
-
-class Chart(SplightDatabaseBaseModel):
-    id: Optional[str] = None
-    name: str
-    description: Optional[str] = Field(
-        default=None, max_length=DESCRIPTION_MAX_LENGTH
-    )
-    items: Optional[List[ChartItem]] = None
-    tab: str
-    position_x: Optional[str] = 0
-    position_y: Optional[str] = 0
-    height: Optional[str] = 28
-    width: Optional[str] = 80
-    min_height: Optional[str] = 14
-    min_width: Optional[str] = 14
-    type: Optional[str] = None
-    timestamp_gte: Optional[str] = None
-    timestamp_lte: Optional[str] = None
-    refresh_interval: Optional[str] = None
-    relative_window_time: Optional[str] = None
-    external_resource: Optional[str] = None
-    external_resource_type: Optional[str] = None
-    y_axis_max_limit: Optional[str] = None
-    y_axis_min_limit: Optional[str] = None
-    config: Optional[Dict[str, Any]] = None
-
-
-class Tab(SplightDatabaseBaseModel):
-    id: Optional[str] = None
-    name: str
-    charts: Optional[List[Chart]] = None
-    order: Optional[int] = None
-    dashboard: str
-
-
-class Dashboard(SplightDatabaseBaseModel):
-    id: Optional[str] = None
-    name: str
-    description: Optional[str] = Field(
-        default=None, max_length=DESCRIPTION_MAX_LENGTH
-    )