Remove kvdriver argument (mis-append from previous CL).

PiperOrigin-RevId: 727049973

connectomics/common/file.py

@@ -219,7 +219,6 @@ def __post_init__(self):
 def dataclass_from_serialized(
     target: Type[T],
     serialized: Union[str, PathLike],
-    kvdriver: str = 'file',
     infer_missing_fields: bool = False,
 ) -> T:
   """Load a dataclass from a serialized instance, file path, or dict.
@@ -228,7 +227,6 @@ def dataclass_from_serialized(
     target: Dataclass to load
     serialized: Serialized instance, file path, or dict to create dataclass
       from.
-    kvdriver: Driver to use for loading.
     infer_missing_fields: Whether to infer missing fields.
 
   Returns:
@@ -250,15 +248,13 @@ def dataclass_from_serialized(
   return load_dataclass_json(
       target,
       as_str,
-      kvdriver=kvdriver,
       infer_missing_fields=infer_missing_fields,
   )
 
 
 def load_json(
     json_or_path: str | PathLike,
     json_path: str | None = None,
-    kvdriver: str = 'file',
 ) -> dict[str, Any]:
   """Load a JSON object from a string or file path via TensorStore."""
   try:
@@ -270,7 +266,7 @@ def load_json(
   path = json_or_path
   spec = {
       'driver': 'json',
-      'kvstore': {'driver': kvdriver, 'path': str(path)},
+      'kvstore': str(path),
   }
   if json_path is not None:
     if not json_path.startswith('/'):
@@ -283,7 +279,6 @@ def load_dataclass_json(
     dataclass_type: Type[T],
     path: PathLike,
     json_path: str | None = None,
-    kvdriver: str = 'file',
     infer_missing_fields: bool = False,
 ) -> T:
   """Load a dataclass from a file path.
@@ -292,14 +287,13 @@ def load_dataclass_json(
     dataclass_type: Dataclass to load
     path: Path to load from.
     json_path: Optional path to load from within the file.
-    kvdriver: Driver to use for loading.
     infer_missing_fields: Whether to infer missing fields.
 
   Returns:
     New dataclass instance.
   """
   return dataclass_type.from_dict(
-      load_json(path, json_path, kvdriver),
+      load_json(path, json_path),
       infer_missing=infer_missing_fields,
   )
 

connectomics/common/file_test.py

@@ -50,20 +50,20 @@ def test_load_dataclass_json(self):
     a = TestDataClass(a=1, b='foo', c=1.0)
     fname = os.path.join(FLAGS.test_tmpdir, 'dc_file')
     file.save_dataclass_json(a, fname)
-    b = file.load_dataclass_json(TestDataClass, fname)
+    b = file.load_dataclass_json(TestDataClass, f'file://{fname}')
     self.assertEqual(a, b)
 
     a = AnotherTestDataClass(a=1, b='foo', c=1.0, inner=a)
     file.save_dataclass_json(a, fname)
 
-    inner = file.load_dataclass_json(TestDataClass, fname, '/inner')
+    inner = file.load_dataclass_json(TestDataClass, f'file://{fname}', '/inner')
     self.assertEqual(inner, a.inner)
 
   def test_dataclass_from_serialized(self):
     a = TestDataClass(a=1, b='foo', c=1.0)
     fname = os.path.join(FLAGS.test_tmpdir, 'dc_file')
     file.save_dataclass_json(a, fname)
-    b = file.dataclass_from_serialized(TestDataClass, fname)
+    b = file.dataclass_from_serialized(TestDataClass, f'file://{fname}')
     self.assertEqual(a, b)
     c = file.dataclass_from_serialized(TestDataClass, a.to_json())
     self.assertEqual(a, c)

connectomics/volume/subvolume_processor.py

@@ -370,7 +370,6 @@ def default_config(
     config_type: DefaultConfigType | None = None,
     overrides: file.PathLike | dict[str, Any] | None = None,
     fallback_to_em_2d: bool = True,
-    kvdriver: str = 'file',
 ) -> T:
   """Returns a default configuration for a given config type and class."""
   if overrides and not isinstance(overrides, dict):
@@ -381,7 +380,7 @@ def default_config(
   if not overrides:
     overrides = None
   if isinstance(overrides, file.PathLike):
-    overrides = file.load_json(overrides, kvdriver=kvdriver)
+    overrides = file.load_json(overrides)
   if config_type is None and fallback_to_em_2d:
     logging.warning('No default config type specified, falling back to EM_2D.')
     config_type = DefaultConfigType.EM_2D