Merge pull request #54 from Oxen-AI/merge-and-remote-repo-updates

Add merge function to Python lib
Oxen-AI · Jan 16, 2025 · 6b4d337 · 6b4d337
2 parents 8756924 + 93985cd
commit 6b4d337
Show file tree

Hide file tree

Showing 31 changed files with 84 additions and 879 deletions.
diff --git a/oxen/Cargo.lock b/oxen/Cargo.lock
diff --git a/oxen/Cargo.toml b/oxen/Cargo.toml
@@ -28,7 +28,7 @@ polars = { version = "0.44.0", features = [
 ] }
 serde_json = "1.0.106"
 uuid = { version = "1.4.1", features = ["serde", "v4"] }
-liboxen = "0.24.1"
+liboxen = "0.24.4"
 # liboxen = { path = "../../Oxen/src/lib" }
 
 [build-dependencies]

diff --git a/oxen/pyproject.toml b/oxen/pyproject.toml
@@ -12,16 +12,12 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
 dependencies = [
-    "numpy",
-    "opencv-python-headless",
     "pandas",
     "polars",
     "pyarrow",
     "requests",
     "toml",
-    "tqdm",
-    "torch",
-    "tensorflow",
+    "tqdm"
 ]
 
 

diff --git a/oxen/python/oxen/__init__.py b/oxen/python/oxen/__init__.py
@@ -17,11 +17,8 @@
 from oxen.remote_repo import RemoteRepo
 from oxen.workspace import Workspace
 from oxen.data_frame import DataFrame
-from oxen.dag import DAG
-from oxen.op import Op
 from oxen import auth
 from oxen import datasets
-from oxen import loaders
 from oxen.clone import clone
 from oxen.diff.diff import diff
 from oxen.init import init
@@ -30,15 +27,13 @@
 # Names of public modules we want to expose
 __all__ = [
     "Dataset",
-    "DAG",
     "PyCommit",
     "PyDataset",
     "PyWorkspace",
     "PyWorkspaceDataFrame",
     "PyRemoteRepo",
     "PyRepo",
     "PyStagedData",
-    "Op",
     "clone",
     "init",
     "is_configured",
@@ -48,7 +43,6 @@
     "Repo",
     "auth",
     "datasets",
-    "loaders",
     "util",
     "diff",
 ]
diff --git a/oxen/python/oxen/dag.py b/oxen/python/oxen/dag.py
diff --git a/oxen/python/oxen/loaders/__init__.py b/oxen/python/oxen/loaders/__init__.py
diff --git a/oxen/python/oxen/loaders/chat.py b/oxen/python/oxen/loaders/chat.py
diff --git a/oxen/python/oxen/loaders/image_classification.py b/oxen/python/oxen/loaders/image_classification.py
diff --git a/oxen/python/oxen/loaders/regression.py b/oxen/python/oxen/loaders/regression.py
diff --git a/oxen/python/oxen/op.py b/oxen/python/oxen/op.py
diff --git a/oxen/python/oxen/ops/__init__.py b/oxen/python/oxen/ops/__init__.py