diff --git a/.github/workflows/autogenerate_requirements.yaml b/.github/workflows/autogenerate_requirements.yaml deleted file mode 100644 index f56e483..0000000 --- a/.github/workflows/autogenerate_requirements.yaml +++ /dev/null @@ -1,43 +0,0 @@ -name: Autogenerate Requirements - -on: - pull_request: - branches: [dev, main] - paths: - - 'pyproject.toml' - - 'tools/autogenerate_requirements.py' - - '.github/workflows/autogenerate_requirements.yaml' - -jobs: - update-requirements: - runs-on: ubuntu-latest - - steps: - - name: Check out repository - uses: actions/checkout@v3 - with: - ref: ${{ github.head_ref }} - - - name: Set up Python - uses: actions/setup-python@v3 - with: - python-version: '3.10' - - - name: Run autogeneration script - run: | - pip install toml - python tools/autogenerate_requirements.py - - - name: Commit files - run: | - git config --global user.name 'GitHub Actions' - git config --global user.email 'actions@github.com' - git diff --quiet requirements.txt || { - git add requirements.txt - git commit -m "[Automated] Updated requirements.txt" - } - - - name: Push changes - uses: ad-m/github-push-action@master - with: - branch: ${{ github.head_ref }} diff --git a/src/datadreamer/__init__.py b/datadreamer/__init__.py similarity index 100% rename from src/datadreamer/__init__.py rename to datadreamer/__init__.py diff --git a/src/datadreamer/dataset_annotation/__init__.py b/datadreamer/dataset_annotation/__init__.py similarity index 100% rename from src/datadreamer/dataset_annotation/__init__.py rename to datadreamer/dataset_annotation/__init__.py diff --git a/src/datadreamer/dataset_annotation/image_annotator.py b/datadreamer/dataset_annotation/image_annotator.py similarity index 100% rename from src/datadreamer/dataset_annotation/image_annotator.py rename to datadreamer/dataset_annotation/image_annotator.py diff --git a/src/datadreamer/dataset_annotation/owlv2_annotator.py b/datadreamer/dataset_annotation/owlv2_annotator.py similarity index 100% rename from src/datadreamer/dataset_annotation/owlv2_annotator.py rename to datadreamer/dataset_annotation/owlv2_annotator.py diff --git a/src/datadreamer/dataset_annotation/utils.py b/datadreamer/dataset_annotation/utils.py similarity index 100% rename from src/datadreamer/dataset_annotation/utils.py rename to datadreamer/dataset_annotation/utils.py diff --git a/src/datadreamer/image_generation/__init__.py b/datadreamer/image_generation/__init__.py similarity index 100% rename from src/datadreamer/image_generation/__init__.py rename to datadreamer/image_generation/__init__.py diff --git a/src/datadreamer/image_generation/clip_image_tester.py b/datadreamer/image_generation/clip_image_tester.py similarity index 100% rename from src/datadreamer/image_generation/clip_image_tester.py rename to datadreamer/image_generation/clip_image_tester.py diff --git a/src/datadreamer/image_generation/image_generator.py b/datadreamer/image_generation/image_generator.py similarity index 100% rename from src/datadreamer/image_generation/image_generator.py rename to datadreamer/image_generation/image_generator.py diff --git a/src/datadreamer/image_generation/sdxl_image_generator.py b/datadreamer/image_generation/sdxl_image_generator.py similarity index 100% rename from src/datadreamer/image_generation/sdxl_image_generator.py rename to datadreamer/image_generation/sdxl_image_generator.py diff --git a/src/datadreamer/image_generation/sdxl_turbo_image_generator.py b/datadreamer/image_generation/sdxl_turbo_image_generator.py similarity index 100% rename from src/datadreamer/image_generation/sdxl_turbo_image_generator.py rename to datadreamer/image_generation/sdxl_turbo_image_generator.py diff --git a/src/datadreamer/pipelines/__init__.py b/datadreamer/pipelines/__init__.py similarity index 100% rename from src/datadreamer/pipelines/__init__.py rename to datadreamer/pipelines/__init__.py diff --git a/src/datadreamer/pipelines/generate_dataset_from_scratch.py b/datadreamer/pipelines/generate_dataset_from_scratch.py similarity index 100% rename from src/datadreamer/pipelines/generate_dataset_from_scratch.py rename to datadreamer/pipelines/generate_dataset_from_scratch.py diff --git a/src/datadreamer/prompt_generation/__init__.py b/datadreamer/prompt_generation/__init__.py similarity index 100% rename from src/datadreamer/prompt_generation/__init__.py rename to datadreamer/prompt_generation/__init__.py diff --git a/src/datadreamer/prompt_generation/lm_prompt_generator.py b/datadreamer/prompt_generation/lm_prompt_generator.py similarity index 100% rename from src/datadreamer/prompt_generation/lm_prompt_generator.py rename to datadreamer/prompt_generation/lm_prompt_generator.py diff --git a/src/datadreamer/prompt_generation/prompt_generator.py b/datadreamer/prompt_generation/prompt_generator.py similarity index 100% rename from src/datadreamer/prompt_generation/prompt_generator.py rename to datadreamer/prompt_generation/prompt_generator.py diff --git a/src/datadreamer/prompt_generation/simple_prompt_generator.py b/datadreamer/prompt_generation/simple_prompt_generator.py similarity index 100% rename from src/datadreamer/prompt_generation/simple_prompt_generator.py rename to datadreamer/prompt_generation/simple_prompt_generator.py diff --git a/src/datadreamer/prompt_generation/synonym_generator.py b/datadreamer/prompt_generation/synonym_generator.py similarity index 100% rename from src/datadreamer/prompt_generation/synonym_generator.py rename to datadreamer/prompt_generation/synonym_generator.py diff --git a/src/datadreamer/utils/__init__.py b/datadreamer/utils/__init__.py similarity index 100% rename from src/datadreamer/utils/__init__.py rename to datadreamer/utils/__init__.py diff --git a/src/datadreamer/utils/convert_dataset_to_yolo.py b/datadreamer/utils/convert_dataset_to_yolo.py similarity index 100% rename from src/datadreamer/utils/convert_dataset_to_yolo.py rename to datadreamer/utils/convert_dataset_to_yolo.py diff --git a/src/datadreamer/utils/nms.py b/datadreamer/utils/nms.py similarity index 100% rename from src/datadreamer/utils/nms.py rename to datadreamer/utils/nms.py diff --git a/examples/image_annotation_example.py b/examples/image_annotation_example.py index 27d9909..c1ce649 100644 --- 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 index b2170c4..011602a 100644 --- 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 index f7e2ffe..fc346bd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,6 +11,7 @@ requires-python = ">=3.8" license = { file = "LICENSE" } maintainers = [{ name = "Luxonis", email = "support@luxonis.com"}] 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 new file mode 100644 index 0000000..4bb28ea --- /dev/null +++ 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 index 0e871e8..1ad0442 100644 --- 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