Skip to content

Commit 8b65390

Browse files
committed
removed ch10 references, no more support
1 parent 3cc3607 commit 8b65390

3 files changed

Lines changed: 4 additions & 35 deletions

File tree

python/lib/sift_client/_internal/low_level_wrappers/data_imports.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
from sift_client._internal.low_level_wrappers.base import LowLevelClientBase
1616
from sift_client.sift_types.data_import import (
17-
Ch10ImportConfig,
1817
CsvImportConfig,
1918
Hdf5ImportConfig,
2019
ImportConfig,
@@ -41,8 +40,6 @@ def _set_config_on_request(
4140
config, (ParquetFlatDatasetImportConfig, ParquetSingleChannelPerRowImportConfig)
4241
):
4342
request.parquet_config.CopyFrom(config._to_proto())
44-
elif isinstance(config, Ch10ImportConfig):
45-
request.ch10_config.CopyFrom(config._to_proto())
4643
elif isinstance(config, TdmsImportConfig):
4744
request.tdms_config.CopyFrom(config._to_proto())
4845
elif isinstance(config, Hdf5ImportConfig):

python/lib/sift_client/resources/data_imports.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from sift_client.sift_types.channel import ChannelDataType
1212
from sift_client.sift_types.data_import import (
1313
EXTENSION_TO_DATA_TYPE_KEY,
14-
Ch10ImportConfig,
1514
CsvImportConfig,
1615
DataTypeKey,
1716
ImportConfig,
@@ -63,7 +62,7 @@ async def import_from_path(
6362
6463
When ``config`` is omitted the file format is auto-detected via
6564
``detect_config`` (CSV and Parquet only). For other formats
66-
(TDMS, HDF5, CH10), ``config`` must be provided.
65+
(TDMS and HDF5), ``config`` must be provided.
6766
When ``asset`` is provided it overrides the config value;
6867
otherwise the config's ``asset_name`` is used.
6968
If neither ``run`` nor ``run_name`` is provided (and none is
@@ -134,14 +133,10 @@ async def import_from_path(
134133
if run is not None and run_name is not None:
135134
raise ValueError("'run' and 'run_name' are mutually exclusive.")
136135
if run is not None:
137-
if isinstance(config, Ch10ImportConfig):
138-
raise ValueError(
139-
"'run' is not supported for Ch10ImportConfig. Use 'run_name' instead."
140-
)
141136
config.run_id = run._id_or_error if isinstance(run, Run) else run
142137
elif run_name is not None:
143138
config.run_name = run_name
144-
elif not config.run_name and (isinstance(config, Ch10ImportConfig) or not config.run_id):
139+
elif not config.run_name and not config.run_id:
145140
config.run_name = path.name
146141

147142
if isinstance(
@@ -204,9 +199,8 @@ async def detect_config(
204199
provided.
205200
206201
Only CSV and Parquet files are currently supported for auto-detection.
207-
For other formats (TDMS, HDF5, CH10), create the config manually
208-
using ``TdmsImportConfig``, ``Hdf5ImportConfig``, or
209-
``Ch10ImportConfig``.
202+
For other formats (TDMS, HDF5), create the config manually
203+
using ``TdmsImportConfig`` or ``Hdf5ImportConfig``.
210204
211205
For CSV files, the server scans the first two rows for an optional
212206
JSON metadata row. Row 1 is checked first; row 2 is checked only

python/lib/sift_client/sift_types/data_import.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from pydantic import BaseModel, model_validator
99
from sift.common.type.v1.channel_config_pb2 import ChannelConfig as ChannelConfigProto
1010
from sift.data_imports.v2.data_imports_pb2 import (
11-
DATA_TYPE_KEY_CH10,
1211
DATA_TYPE_KEY_CSV,
1312
DATA_TYPE_KEY_HDF5,
1413
DATA_TYPE_KEY_PARQUET_FLATDATASET,
@@ -19,7 +18,6 @@
1918
PARQUET_COMPLEX_TYPES_IMPORT_MODE_IGNORE,
2019
PARQUET_COMPLEX_TYPES_IMPORT_MODE_STRING,
2120
)
22-
from sift.data_imports.v2.data_imports_pb2 import Ch10Config as Ch10ConfigProto
2321
from sift.data_imports.v2.data_imports_pb2 import CsvConfig as CsvConfigProto
2422
from sift.data_imports.v2.data_imports_pb2 import CsvTimeColumn as CsvTimeColumnProto
2523
from sift.data_imports.v2.data_imports_pb2 import Hdf5Config as Hdf5ConfigProto
@@ -70,14 +68,12 @@ class DataTypeKey(Enum):
7068
PARQUET_FLATDATASET = DATA_TYPE_KEY_PARQUET_FLATDATASET
7169
PARQUET_SINGLE_CHANNEL_PER_ROW = DATA_TYPE_KEY_PARQUET_SINGLE_CHANNEL_PER_ROW
7270
TDMS = DATA_TYPE_KEY_TDMS
73-
CH10 = DATA_TYPE_KEY_CH10
7471
HDF5 = DATA_TYPE_KEY_HDF5
7572

7673

7774
EXTENSION_TO_DATA_TYPE_KEY: dict[str, DataTypeKey] = {
7875
".csv": DataTypeKey.CSV,
7976
".tdms": DataTypeKey.TDMS,
80-
".ch10": DataTypeKey.CH10,
8177
".h5": DataTypeKey.HDF5,
8278
".hdf5": DataTypeKey.HDF5,
8379
}
@@ -537,23 +533,6 @@ def _from_proto(
537533
)
538534

539535

540-
class Ch10ImportConfig(ImportConfigBase):
541-
"""Configuration for importing a CH10 file.
542-
543-
Attributes:
544-
scale_values: Whether to apply EU (engineering unit) scaling to channel values.
545-
"""
546-
547-
scale_values: bool = False
548-
549-
def _to_proto(self) -> Ch10ConfigProto:
550-
return Ch10ConfigProto(
551-
asset_name=self.asset_name,
552-
run_name=self.run_name or "",
553-
scale_values=self.scale_values,
554-
)
555-
556-
557536
class TdmsImportConfig(ImportConfigBase):
558537
"""Configuration for importing a TDMS file.
559538
@@ -655,7 +634,6 @@ def _to_proto(self) -> Hdf5ConfigProto:
655634
CsvImportConfig,
656635
ParquetFlatDatasetImportConfig,
657636
ParquetSingleChannelPerRowImportConfig,
658-
Ch10ImportConfig,
659637
TdmsImportConfig,
660638
Hdf5ImportConfig,
661639
]

0 commit comments

Comments
 (0)