feat: allow python version 3.9

pyproject.toml

@@ -1,12 +1,12 @@
 [project]
 name = "splight-lib"
-version = "5.22.4"
+version = "5.22.5"
 description = "Splight Python Library"
 authors = [
 {name = "Splight Dev",email = "[email protected]"}
 ]
 readme = "README.md"
-requires-python = ">=3.11,<=3.12"
+requires-python = ">=3.10,<=3.12"
 dependencies = [
  "apscheduler==3.10.4",
  "concurrent-log-handler==0.9.21",
@@ -23,7 +23,6 @@ dependencies = [
  "parameterized==0.8.1",
  "pathspec==0.11.1",
  "progressbar2==4.4.1",
- "protobuf==4.25.8",
  "py7zr==0.20.8",
  "pydantic==2.4.2",
  "pydantic-settings==2.0.3",

splight_lib/client/datalake/builder.py

@@ -18,10 +18,10 @@ def build(
  parameters: dict[str, Any] ={},
  ) -> AbstractDatalakeClient:
  if version == SplightAPIVersion.V3:
-Builder = V3DatalakeClientBuilder
+builder = V3DatalakeClientBuilder
  elif version == SplightAPIVersion.V4:
-Builder = V4DatalakeClientBuilder
+builder = V4DatalakeClientBuilder
  else:
  raise ValueError(f"Unsupported API version:{version}")
 
- return Builder.build(dl_client_type, parameters)
+ return builder.build(dl_client_type, parameters)

splight_lib/models/_v3/__init__.py

@@ -1,9 +1,10 @@
-from splight_lib.settings import SplightAPIVersion, api_settings
+# from splight_lib.settings import SplightAPIVersion, api_settings
 
-if api_settings.API_VERSION != SplightAPIVersion.V3:
- raise ImportError(
- f"Unable to import models from this module when API_VERSION is not set to '{SplightAPIVersion.V3}'."
- )
+# TODO: Revert this change when possible
+# if api_settings.API_VERSION != SplightAPIVersion.V3:
+# raise ImportError(
+# f"Unable to import models from this module when API_VERSION is not set to '{SplightAPIVersion.V3}'."
+# )
 
 from splight_lib.models._v3.actions import Action, SetPoint
 from splight_lib.models._v3.alert import Alert, AlertItem

splight_lib/models/_v3/datalake.py

@@ -1,9 +1,10 @@
 from datetime import datetime
 from enum import Enum
 from hashlib import sha256
-from typing import Annotated, Any, Generator, Generic, Literal, Self, TypeVar
+from typing import Annotated, Any, Generator, Generic, Literal, TypeVar
 
 from pydantic import BaseModel, ConfigDict, Field, PrivateAttr
+from typing_extensions import Self
 
 from splight_lib.client.datalake import DatalakeClientBuilder
 from splight_lib.client.datalake.common.abstract import AbstractDatalakeClient
@@ -12,7 +13,7 @@
 from splight_lib.models._v3.attribute import Attribute
 from splight_lib.models._v3.exceptions import TraceAlreadyExistsError
 from splight_lib.settings import (
-api_settings,
+SplightAPIVersion,
  datalake_settings,
  workspace_settings,
 )
@@ -27,14 +28,14 @@ def hash(string: str) -> str:
 
 def get_datalake_client() -> AbstractDatalakeClient:
  return DatalakeClientBuilder.build(
- version=api_settings.API_VERSION,
+ version=SplightAPIVersion.V3,
  dl_client_type="sync",
  parameters={
  "resource": "attributes",
  "base_url": workspace_settings.SPLIGHT_PLATFORM_API_HOST,
  "access_id": workspace_settings.SPLIGHT_ACCESS_ID,
  "secret_key": workspace_settings.SPLIGHT_SECRET_KEY,
- "api_version": api_settings.API_VERSION,
+ "api_version": SplightAPIVersion.V3,
  "buffer_size": datalake_settings.DL_BUFFER_SIZE,
  "buffer_timeout": datalake_settings.DL_BUFFER_TIMEOUT,
  },

splight_lib/models/_v3/datalake_base.py

@@ -1,8 +1,9 @@
 from datetime import datetime, timezone
-from typing import Any, ClassVar, Dict, Self, TypeVar
+from typing import Any, ClassVar, Dict, TypeVar
 
 import pandas as pd
 from pydantic import BaseModel, ConfigDict, Field
+from typing_extensions import Self
 
 from splight_lib.models._v3.asset import Asset
 from splight_lib.models._v3.attribute import Attribute

splight_lib/models/_v3/hub.py

@@ -1,9 +1,10 @@
 import warnings
 from enum import auto
-from typing import Any, Self
+from typing import Any
 
 from pydantic import BaseModel, PrivateAttr, ValidationInfo, model_validator
 from strenum import LowercaseStrEnum
+from typing_extensions import Self
 
 from splight_lib.client.hub.abstract import AbstractHubClient
 from splight_lib.client.hub.client import SplightHubClient

splight_lib/models/_v3/native.py

@@ -1,8 +1,9 @@
 from datetime import datetime, timedelta, timezone
-from typing import ClassVar, Literal, Self
+from typing import ClassVar, Literal
 
 import pandas as pd
 from pydantic import field_validator
+from typing_extensions import Self
 
 from splight_lib.models._v3.asset import Asset
 from splight_lib.models._v3.attribute import Attribute

splight_lib/models/_v3/secret.py

@@ -1,4 +1,4 @@
-from typing import Self
+from typing_extensions import Self
 
 from splight_lib.models.database import SplightDatabaseBaseModel
 

splight_lib/models/_v4/__init__.py

@@ -50,12 +50,14 @@
 from splight_lib.models._v4.slack_line import SlackLine
 from splight_lib.models._v4.tag import Tag
 from splight_lib.models._v4.transformer import Transformer
-from splight_lib.settings import SplightAPIVersion, api_settings
 
-if api_settings.API_VERSION != SplightAPIVersion.V4:
- raise ImportError(
- f"Unable to import models from this module when API_VERSION is not set to '{SplightAPIVersion.V4}'."
- )
+# from splight_lib.settings import SplightAPIVersion, api_settings
+
+# TODO: Revert this change when possible
+# if api_settings.API_VERSION != SplightAPIVersion.V4:
+# raise ImportError(
+# f"Unable to import models from this module when API_VERSION is not set to '{SplightAPIVersion.V4}'."
+# )
 
 
 __all__ = [

splight_lib/models/_v4/datalake_base.py

@@ -1,8 +1,9 @@
 from datetime import datetime, timezone
-from typing import Dict, Self, TypeVar
+from typing import Dict, TypeVar
 
 import pandas as pd
 from pydantic import BaseModel, ConfigDict, Field
+from typing_extensions import Self
 
 from splight_lib.models._v4.asset import Asset
 from splight_lib.models._v4.attribute import Attribute

splight_lib/models/_v4/hub.py

@@ -1,9 +1,10 @@
 import warnings
 from enum import auto
-from typing import Any, Self
+from typing import Any
 
 from pydantic import BaseModel, PrivateAttr, ValidationInfo, model_validator
 from strenum import LowercaseStrEnum
+from typing_extensions import Self
 
 from splight_lib.client.hub.abstract import AbstractHubClient
 from splight_lib.client.hub.client import SplightHubClient

splight_lib/models/_v4/native.py

@@ -1,8 +1,9 @@
 from datetime import datetime, timedelta, timezone
-from typing import ClassVar, Literal, Self
+from typing import ClassVar, Literal
 
 import pandas as pd
 from pydantic import field_validator
+from typing_extensions import Self
 
 from splight_lib.models._v4.asset import Asset
 from splight_lib.models._v4.attribute import Attribute

splight_lib/models/_v4/secret.py

@@ -1,4 +1,4 @@
-from typing import Self
+from typing_extensions import Self
 
 from splight_lib.models.database import SplightDatabaseBaseModel