Merge pull request #61 from verda-cloud/fix-sub-imports

shamrin · web-flow · commit 025443b80173 · 2025-11-27T14:39:32.000+02:00
fix from datacrunch.constants and friends
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Fix imports from `datacrunch.*` modules
+
 ## [1.17.1] - 2025-11-27
 
 ### Changed
diff --git a/datacrunch_compat/datacrunch/InferenceClient/__init__.py b/datacrunch_compat/datacrunch/InferenceClient/__init__.py
@@ -0,0 +1,3 @@
+from verda.InferenceClient import InferenceClient, InferenceResponse
+
+__all__ = ['InferenceClient', 'InferenceResponse']
diff --git a/datacrunch_compat/datacrunch/InferenceClient/inference_client.py b/datacrunch_compat/datacrunch/InferenceClient/inference_client.py
@@ -0,0 +1 @@
+from verda.InferenceClient.inference_client import *
diff --git a/datacrunch_compat/datacrunch/authentication.py b/datacrunch_compat/datacrunch/authentication.py
@@ -0,0 +1 @@
+from verda.authentication import *
diff --git a/datacrunch_compat/datacrunch/balance.py b/datacrunch_compat/datacrunch/balance.py
@@ -0,0 +1 @@
+from verda.balance import *
diff --git a/datacrunch_compat/datacrunch/constants.py b/datacrunch_compat/datacrunch/constants.py
@@ -0,0 +1 @@
+from verda.constants import *
diff --git a/datacrunch_compat/datacrunch/containers.py b/datacrunch_compat/datacrunch/containers.py
@@ -0,0 +1 @@
+from verda.containers import *
diff --git a/datacrunch_compat/datacrunch/exceptions.py b/datacrunch_compat/datacrunch/exceptions.py
@@ -0,0 +1 @@
+from verda.exceptions import *
diff --git a/datacrunch_compat/datacrunch/helpers.py b/datacrunch_compat/datacrunch/helpers.py
@@ -0,0 +1 @@
+from verda.helpers import *
diff --git a/datacrunch_compat/datacrunch/http_client.py b/datacrunch_compat/datacrunch/http_client.py
@@ -0,0 +1 @@
+from verda.http_client import *
diff --git a/datacrunch_compat/datacrunch/images.py b/datacrunch_compat/datacrunch/images.py
@@ -0,0 +1 @@
+from verda.images import *
diff --git a/datacrunch_compat/datacrunch/instance_types.py b/datacrunch_compat/datacrunch/instance_types.py
@@ -0,0 +1 @@
+from verda.instance_types import *
diff --git a/datacrunch_compat/datacrunch/instances.py b/datacrunch_compat/datacrunch/instances.py
@@ -0,0 +1 @@
+from verda.instances import *
diff --git a/datacrunch_compat/datacrunch/locations.py b/datacrunch_compat/datacrunch/locations.py
@@ -0,0 +1 @@
+from verda.locations import *
diff --git a/datacrunch_compat/datacrunch/ssh_keys.py b/datacrunch_compat/datacrunch/ssh_keys.py
@@ -0,0 +1 @@
+from verda.ssh_keys import *
diff --git a/datacrunch_compat/datacrunch/startup_scripts.py b/datacrunch_compat/datacrunch/startup_scripts.py
@@ -0,0 +1 @@
+from verda.startup_scripts import *
diff --git a/datacrunch_compat/datacrunch/volume_types.py b/datacrunch_compat/datacrunch/volume_types.py
@@ -0,0 +1 @@
+from verda.volume_types import *
diff --git a/datacrunch_compat/datacrunch/volumes.py b/datacrunch_compat/datacrunch/volumes.py
@@ -0,0 +1 @@
+from verda.volumes import *
diff --git a/datacrunch_compat/tests/smoke_datacrunch.py b/datacrunch_compat/tests/smoke_datacrunch.py
@@ -1,6 +1,7 @@
-import datacrunch
 import responses
 from datacrunch import DataCrunchClient
+from datacrunch.constants import Locations
+from datacrunch.InferenceClient.inference_client import AsyncStatus
 
 BASE_URL = 'https://example.com'
 
@@ -23,6 +24,10 @@ def main():
     client = DataCrunchClient('id', 'secret', BASE_URL)
     assert client.constants.base_url == BASE_URL
 
+    assert AsyncStatus.Initialized == 'Initialized'
+
+    assert Locations.FIN_03 == 'FIN-03'
+
 
 if __name__ == '__main__':
     main()
diff --git a/datacrunch_compat/tests/test_datacrunch.py b/datacrunch_compat/tests/test_datacrunch.py
@@ -50,3 +50,21 @@ def test_datacrunch_constants_module():
 
     assert constants.base_url == 'url'
     assert constants.version == 'v1'
+
+
+def test_datacrunch_constants_submodule():
+    # Test that old re-exports in datacrunch.constants still work
+
+    with pytest.warns(DeprecationWarning, match='datacrunch is deprecated'):
+        from datacrunch.constants import Locations
+
+    assert Locations.FIN_03 == 'FIN-03'
+
+
+def test_datacrunch_inference_submodule():
+    # Test that old re-exports in datacrunch.InferenceClient.* still work
+
+    with pytest.warns(DeprecationWarning, match='datacrunch is deprecated'):
+        from datacrunch.InferenceClient.inference_client import AsyncStatus
+
+    assert AsyncStatus.Initialized == 'Initialized'
diff --git a/pyproject.toml b/pyproject.toml
@@ -86,6 +86,7 @@ ignore = ["F401", "B006", "D100", "D105", "D107"]
 [tool.ruff.lint.per-file-ignores]
 "{tests,examples,datacrunch_compat/tests}/*" = ["D"]
 "__init__.py" = ["D104"]
+"datacrunch_compat/datacrunch/*.py" = ["F403"]
 
 [tool.ruff.format]
 quote-style = "single"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+from verda.InferenceClient import InferenceClient, InferenceResponse`
	`2`	`+`
	`3`	`+__all__ = ['InferenceClient', 'InferenceResponse']`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+from verda.InferenceClient.inference_client import *`