From 5c15932ee78634dc07c3a6d842c2dfb6da10973c Mon Sep 17 00:00:00 2001
From: Alexey Shamrin <alexey@datacrunch.io>
Date: Thu, 27 Nov 2025 14:25:02 +0200
Subject: [PATCH] fix from datacrunch.constants and friends

---
 CHANGELOG.md                                   |  4 ++++
 .../datacrunch/InferenceClient/__init__.py     |  3 +++
 .../InferenceClient/inference_client.py        |  1 +
 datacrunch_compat/datacrunch/authentication.py |  1 +
 datacrunch_compat/datacrunch/balance.py        |  1 +
 datacrunch_compat/datacrunch/constants.py      |  1 +
 datacrunch_compat/datacrunch/containers.py     |  1 +
 datacrunch_compat/datacrunch/exceptions.py     |  1 +
 datacrunch_compat/datacrunch/helpers.py        |  1 +
 datacrunch_compat/datacrunch/http_client.py    |  1 +
 datacrunch_compat/datacrunch/images.py         |  1 +
 datacrunch_compat/datacrunch/instance_types.py |  1 +
 datacrunch_compat/datacrunch/instances.py      |  1 +
 datacrunch_compat/datacrunch/locations.py      |  1 +
 datacrunch_compat/datacrunch/ssh_keys.py       |  1 +
 .../datacrunch/startup_scripts.py              |  1 +
 datacrunch_compat/datacrunch/volume_types.py   |  1 +
 datacrunch_compat/datacrunch/volumes.py        |  1 +
 datacrunch_compat/tests/smoke_datacrunch.py    |  7 ++++++-
 datacrunch_compat/tests/test_datacrunch.py     | 18 ++++++++++++++++++
 pyproject.toml                                 |  1 +
 21 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 datacrunch_compat/datacrunch/InferenceClient/__init__.py
 create mode 100644 datacrunch_compat/datacrunch/InferenceClient/inference_client.py
 create mode 100644 datacrunch_compat/datacrunch/authentication.py
 create mode 100644 datacrunch_compat/datacrunch/balance.py
 create mode 100644 datacrunch_compat/datacrunch/constants.py
 create mode 100644 datacrunch_compat/datacrunch/containers.py
 create mode 100644 datacrunch_compat/datacrunch/exceptions.py
 create mode 100644 datacrunch_compat/datacrunch/helpers.py
 create mode 100644 datacrunch_compat/datacrunch/http_client.py
 create mode 100644 datacrunch_compat/datacrunch/images.py
 create mode 100644 datacrunch_compat/datacrunch/instance_types.py
 create mode 100644 datacrunch_compat/datacrunch/instances.py
 create mode 100644 datacrunch_compat/datacrunch/locations.py
 create mode 100644 datacrunch_compat/datacrunch/ssh_keys.py
 create mode 100644 datacrunch_compat/datacrunch/startup_scripts.py
 create mode 100644 datacrunch_compat/datacrunch/volume_types.py
 create mode 100644 datacrunch_compat/datacrunch/volumes.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6303555..b6d7cbe 100644
--- 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
new file mode 100644
index 0000000..d351e4d
--- /dev/null
+++ 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
new file mode 100644
index 0000000..83acb4a
--- /dev/null
+++ 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
new file mode 100644
index 0000000..ef25cb7
--- /dev/null
+++ 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
new file mode 100644
index 0000000..f5be9d1
--- /dev/null
+++ 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
new file mode 100644
index 0000000..2efb5a9
--- /dev/null
+++ 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
new file mode 100644
index 0000000..343ab6b
--- /dev/null
+++ 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
new file mode 100644
index 0000000..958c484
--- /dev/null
+++ 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
new file mode 100644
index 0000000..470e700
--- /dev/null
+++ 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
new file mode 100644
index 0000000..c67cf95
--- /dev/null
+++ 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
new file mode 100644
index 0000000..fe33d0e
--- /dev/null
+++ 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
new file mode 100644
index 0000000..b5f6120
--- /dev/null
+++ 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
new file mode 100644
index 0000000..8a543b7
--- /dev/null
+++ 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
new file mode 100644
index 0000000..0c67aea
--- /dev/null
+++ 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
new file mode 100644
index 0000000..e8d5fa0
--- /dev/null
+++ 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
new file mode 100644
index 0000000..5db2d9d
--- /dev/null
+++ 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
new file mode 100644
index 0000000..94e73f5
--- /dev/null
+++ 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
new file mode 100644
index 0000000..1159928
--- /dev/null
+++ 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
index 2f313b7..e1ef870 100644
--- 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
index 7755fa2..b16ee8d 100644
--- 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
index 065d79e..c5c8b5f 100644
--- 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"