Merge pull request #22 from luxonis/chore/luxonis-ml-structure

LuxonisML Package Structure
luxonis · Jan 15, 2024 · 329a0b6 · 329a0b6
2 parents 5645018 + c1f1129
commit 329a0b6
Show file tree

Hide file tree

Showing 26 changed files with 11 additions and 69 deletions.
diff --git a/.github/workflows/autogenerate_requirements.yaml b/.github/workflows/autogenerate_requirements.yaml
diff --git a/src/datadreamer/__init__.py → datadreamer/__init__.py b/src/datadreamer/__init__.py → datadreamer/__init__.py
diff --git a/...atadreamer/dataset_annotation/__init__.py → datadreamer/dataset_annotation/__init__.py b/...atadreamer/dataset_annotation/__init__.py → datadreamer/dataset_annotation/__init__.py
diff --git a/...mer/dataset_annotation/image_annotator.py → ...mer/dataset_annotation/image_annotator.py b/...mer/dataset_annotation/image_annotator.py → ...mer/dataset_annotation/image_annotator.py
diff --git a/...mer/dataset_annotation/owlv2_annotator.py → ...mer/dataset_annotation/owlv2_annotator.py b/...mer/dataset_annotation/owlv2_annotator.py → ...mer/dataset_annotation/owlv2_annotator.py
diff --git a/src/datadreamer/dataset_annotation/utils.py → datadreamer/dataset_annotation/utils.py b/src/datadreamer/dataset_annotation/utils.py → datadreamer/dataset_annotation/utils.py
diff --git a/src/datadreamer/image_generation/__init__.py → datadreamer/image_generation/__init__.py b/src/datadreamer/image_generation/__init__.py → datadreamer/image_generation/__init__.py
diff --git a/...mer/image_generation/clip_image_tester.py → ...mer/image_generation/clip_image_tester.py b/...mer/image_generation/clip_image_tester.py → ...mer/image_generation/clip_image_tester.py
diff --git a/...eamer/image_generation/image_generator.py → ...eamer/image_generation/image_generator.py b/...eamer/image_generation/image_generator.py → ...eamer/image_generation/image_generator.py
diff --git a/.../image_generation/sdxl_image_generator.py → .../image_generation/sdxl_image_generator.py b/.../image_generation/sdxl_image_generator.py → .../image_generation/sdxl_image_generator.py
diff --git a/..._generation/sdxl_turbo_image_generator.py → ..._generation/sdxl_turbo_image_generator.py b/..._generation/sdxl_turbo_image_generator.py → ..._generation/sdxl_turbo_image_generator.py
diff --git a/src/datadreamer/pipelines/__init__.py → datadreamer/pipelines/__init__.py b/src/datadreamer/pipelines/__init__.py → datadreamer/pipelines/__init__.py
diff --git a/...ipelines/generate_dataset_from_scratch.py → ...ipelines/generate_dataset_from_scratch.py b/...ipelines/generate_dataset_from_scratch.py → ...ipelines/generate_dataset_from_scratch.py
diff --git a/...datadreamer/prompt_generation/__init__.py → datadreamer/prompt_generation/__init__.py b/...datadreamer/prompt_generation/__init__.py → datadreamer/prompt_generation/__init__.py
diff --git a/.../prompt_generation/lm_prompt_generator.py → .../prompt_generation/lm_prompt_generator.py b/.../prompt_generation/lm_prompt_generator.py → .../prompt_generation/lm_prompt_generator.py
diff --git a/...mer/prompt_generation/prompt_generator.py → ...mer/prompt_generation/prompt_generator.py b/...mer/prompt_generation/prompt_generator.py → ...mer/prompt_generation/prompt_generator.py
diff --git a/...mpt_generation/simple_prompt_generator.py → ...mpt_generation/simple_prompt_generator.py b/...mpt_generation/simple_prompt_generator.py → ...mpt_generation/simple_prompt_generator.py
diff --git a/...er/prompt_generation/synonym_generator.py → ...er/prompt_generation/synonym_generator.py b/...er/prompt_generation/synonym_generator.py → ...er/prompt_generation/synonym_generator.py
diff --git a/src/datadreamer/utils/__init__.py → datadreamer/utils/__init__.py b/src/datadreamer/utils/__init__.py → datadreamer/utils/__init__.py
diff --git a/...adreamer/utils/convert_dataset_to_yolo.py → datadreamer/utils/convert_dataset_to_yolo.py b/...adreamer/utils/convert_dataset_to_yolo.py → datadreamer/utils/convert_dataset_to_yolo.py
diff --git a/src/datadreamer/utils/nms.py → datadreamer/utils/nms.py b/src/datadreamer/utils/nms.py → datadreamer/utils/nms.py
diff --git a/examples/image_annotation_example.py b/examples/image_annotation_example.py
@@ -1,9 +1,10 @@
 import matplotlib.patches as patches
 import matplotlib.pyplot as plt
 import numpy as np
-from datadreamer.dataset_annotation import OWLv2Annotator
 from PIL import Image
 
+from datadreamer.dataset_annotation import OWLv2Annotator
+
 # Initialize the OWLv2Annotator
 annotator = OWLv2Annotator(
     seed=42,

diff --git a/examples/image_generation_example.py b/examples/image_generation_example.py
@@ -1,4 +1,5 @@
 import matplotlib.pyplot as plt
+
 from datadreamer.image_generation import (
     StableDiffusionTurboImageGenerator,
 )

diff --git a/pyproject.toml b/pyproject.toml
@@ -11,6 +11,7 @@ requires-python = ">=3.8"
 license = { file = "LICENSE" }
 maintainers = [{ name = "Luxonis", email = "[email protected]"}]
 keywords = ["computer vision", "AI", "machine learning", "generative models"]
+dynamic = ["dependencies", "optional-dependencies"]
 classifiers = [
     "License :: OSI Approved :: Apache Software License",
     "Development Status :: 3 - Alpha",
@@ -21,26 +22,10 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Image Processing",
     "Topic :: Scientific/Engineering :: Image Recognition",
 ]
-dependencies = [
-    "torch>=2.0.0",
-    "torchvision>=0.16.0",
-    "transformers>=4.0.0",
-    "diffusers>=0.24.0",
-    "compel>=2.0.0",
-    "tqdm>=4.0.0",
-    "Pillow>=9.0.0",
-    "numpy>=1.22.0",
-    "matplotlib>=3.6.0",
-    "opencv-python>=4.7.0",
-    "accelerate>=0.25.0",
-    "scipy>=1.10.0",
-]
-[project.optional-dependencies]
-dev = [
-    "datadreamer",
-    "pre-commit>=3.2.1",
-    "toml>=0.10.2",
-]
+
+[tool.setuptools.dynamic]
+dependencies = { file = ["requirements.txt"] }
+optional-dependencies = { dev = { file = ["requirements-dev.txt"] } }
 
 [project.urls]
 Homepage = "https://github.com/luxonis/datadreamer"
@@ -49,7 +34,7 @@ Homepage = "https://github.com/luxonis/datadreamer"
 datadreamer = "datadreamer.pipelines.generate_dataset_from_scratch:main"
 
 [tool.setuptools.packages.find]
-where = ["src"]
+where = ["."]
 
 [tool.ruff]
 target-version = "py38"

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -0,0 +1,2 @@
+pre-commit>=3.2.1
+toml>=0.10.2
diff --git a/requirements.txt b/requirements.txt
@@ -10,7 +10,3 @@ matplotlib>=3.6.0
 opencv-python>=4.7.0
 accelerate>=0.25.0
 scipy>=1.10.0
-
-# dev
-pre-commit>=3.2.1
-toml>=0.10.2