Merge pull request #87 from ampas/feature/app_restructure_clean

PR: Refactor repository structure.

Author: KelSolaar

.gitignore

@@ -6,3 +6,4 @@
 .idea
 __pycache__
 poetry.lock
+/tests/output/**

.pre-commit-config.yaml

@@ -36,7 +36,7 @@ repos:
     rev: 1.16.0
     hooks:
       - id: blacken-docs
-        language_version: python3.9
+        language_version: python3.10
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: "v3.1.0"
     hooks:

Dockerfile

@@ -1,7 +1,44 @@
 FROM python:3.12
+ENV PYTHON_MAJOR_MINOR_VERSION 3.12
 
 RUN apt-get update \
-    && apt-get -y install ffmpeg libsm6 libxext6
+    && apt-get -y install build-essential gcc g++ build-essential git cmake mlocate automake autotools-dev libtool  \
+    libltdl-dev autoconf pkg-config m4 tree ffmpeg libsm6 libxext6 libpng-dev libgif-dev libwebp-dev libraw-dev \
+    libopenjp2-7-dev libopenexr-dev libdcmtk-dev libtiff-dev libtbb-dev libfreetype6-dev libboost-all-dev \
+    libopencv-dev pybind11-dev
+
+ENV BUILD_DIR=/oiio_build \
+    OIIO_VER=2.4.17.0 \
+    OCIO_VER=v2.3.2 \
+    PACKAGE_ROOT=/oiio_build/install \
+    PYBIND11_VERSION=v2.11.1
+
+# Create the build directory for OIIO
+RUN mkdir -p "${BUILD_DIR}"
+
+# Download and extract the OpenImageIO source
+WORKDIR ${BUILD_DIR}
+RUN curl -LO https://github.com/OpenImageIO/oiio/archive/refs/tags/v${OIIO_VER}.tar.gz \
+    && tar xzf v${OIIO_VER}.tar.gz
+
+# Set the OpenColorIO version environment variable and build OpenImageIO
+WORKDIR ${BUILD_DIR}/OpenImageIO-${OIIO_VER}
+RUN export OPENCOLORIO_VERSION=${OCIO_VER} \
+    && src/build-scripts/build_pybind11.bash \
+    && src/build-scripts/build_opencolorio.bash \
+    && OIIO_BUILD_TESTS=0 OIIO_BUILD_TOOLS=0 make BUILD_SHARED_LIBS=0 CMAKE_CXX_STANDARD=14 PYBIND11_VERSION=v2.11.1 ENABLE_DICOM=0 ENABLE_DCMTK=0 \
+    && make install
+
+# Prepare the package
+RUN mkdir -p "${PACKAGE_ROOT}/usr" \
+    && cp -r "${BUILD_DIR}/OpenImageIO-${OIIO_VER}/dist/." "${PACKAGE_ROOT}/" \
+    && cp -r "${BUILD_DIR}/OpenImageIO-${OIIO_VER}/ext/dist/." "${PACKAGE_ROOT}/"
+
+#Set The PYTHON PATH
+ENV PYTHONPATH="${PYTHONPATH}:/oiio_build/install/lib/python${PYTHON_MAJOR_MINOR_VERSION}/site-packages/OpenImageIO"
+ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/oiio_build/install/lib/"
+
+# Continue With IDT Calculator
 WORKDIR /tmp
 COPY ./requirements.txt /tmp
 RUN pip install -r requirements.txt \

LICENSE.md

@@ -18,4 +18,4 @@ This license shall be construed pursuant to the laws of the State of California,
 
 Disclaimer of Warranty: THIS SOFTWARE IS PROVIDED BY A.M.P.A.S. AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL A.M.P.A.S., OR ANY CONTRIBUTORS OR DISTRIBUTORS, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, RESITUTIONARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-WITHOUT LIMITING THE GENERALITY OF THE FOREGOING, THE ACADEMY SPECIFICALLY DISCLAIMS ANY REPRESENTATIONS OR WARRANTIES WHATSOEVER RELATED TO PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS IN THE ACADEMY COLOR ENCODING SYSTEM, OR APPLICATIONS THEREOF, HELD BY PARTIES OTHER THAN A.M.P.A.S.,WHETHER DISCLOSED OR UNDISCLOSED.
+WITHOUT LIMITING THE GENERALITY OF THE FOREGOING, THE ACADEMY SPECIFICALLY DISCLAIMS ANY REPRESENTATIONS OR WARRANTIES WHATSOEVER RELATED TO PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS IN THE ACADEMY COLOR ENCODING SYSTEM, OR APPLICATIONS THEREOF, HELD BY PARTIES OTHER THAN A.M.P.A.S.,WHETHER DISCLOSED OR UNDISCLOSED.

README.md

@@ -206,12 +206,13 @@ It is also possible to use floating point exposure values by naming the director
 ![IDT Archive Implicit Structure - Floating Point Values](docs/_static/idt_archive_implicit_structure_fractional_ev.png)
 
 ## License
+
 This project is licensed under the terms of the [LICENSE](./LICENSE.md) agreement.
 
 ## Contributing
+
 Thank you for your interest in contributing to our project. Before any contributions can be accepted, we require contributors to sign a Contributor License Agreement (CLA) to ensure that the project can freely use your contributions. You can find more details and instructions on how to sign the CLA in the [CONTRIBUTING.md](./CONTRIBUTING.md) file.
 
 ## Support
-For support, please visit [ACESCentral.com](https://acescentral.com)
-
 
+For support, please visit [ACESCentral.com](https://acescentral.com)

SUPPORT.md

@@ -1,3 +1,3 @@
 # Support
 
-For support, please visit [ACESCentral.com](https://acescentral.com)
+For support, please visit [ACESCentral.com](https://acescentral.com)

aces/idt/__init__.py

@@ -1,33 +1,93 @@
-from .common import (
+from .core import (
+    CAT,
+    OPTIMISATION_FACTORIES,
+    RGB_COLORCHECKER_CLASSIC_ACES,
+    SAMPLES_COUNT_DEFAULT,
+    SD_ILLUMINANT_ACES,
+    SDS_COLORCHECKER_CLASSIC,
+    SETTINGS_SEGMENTATION_COLORCHECKER_CLASSIC,
+    DecodingMethods,
+    DirectoryStructure,
+    Interpolators,
+    LUTSize,
+    Metadata,
+    MetadataProperty,
+    MixinSerializableProperties,
+    OptimizationSpace,
+    PathEncoder,
+    ProjectSettingsMetadataConstants,
+    RGBDisplayColourspace,
+    SerializableConstants,
+    UICategories,
+    UITypes,
     clf_processing_elements,
     error_delta_E,
+    extract_archive,
+    format_exposure_key,
     generate_reference_colour_checker,
-    optimisation_factory_IPT,
-    optimisation_factory_Oklab,
-    png_compare_colour_checkers,
-)
-from .prosumer_camera import IDTGeneratorProsumerCamera
-from .utilities import (
+    get_sds_colour_checker,
+    get_sds_illuminant,
     hash_file,
     list_sub_directories,
     mask_outliers,
+    metadata_property,
+    optimisation_factory_IPT,
+    optimisation_factory_Oklab,
+    png_compare_colour_checkers,
     slugify,
+    sort_exposure_keys,
     working_directory,
 )
+from .framework import IDTProjectSettings
+from .generators import GENERATORS, IDTBaseGenerator, IDTGeneratorProsumerCamera
+
+from .application import IDTGeneratorApplication  # isort: skip
 
 __all__ = [
+    "CAT",
+    "OPTIMISATION_FACTORIES",
+    "RGB_COLORCHECKER_CLASSIC_ACES",
+    "SAMPLES_COUNT_DEFAULT",
+    "SD_ILLUMINANT_ACES",
+    "SDS_COLORCHECKER_CLASSIC",
+    "SETTINGS_SEGMENTATION_COLORCHECKER_CLASSIC",
+    "DecodingMethods",
+    "DirectoryStructure",
+    "Interpolators",
+    "LUTSize",
+    "Metadata",
+    "MetadataProperty",
+    "MixinSerializableProperties",
+    "OptimizationSpace",
+    "PathEncoder",
+    "ProjectSettingsMetadataConstants",
+    "RGBDisplayColourspace",
+    "SerializableConstants",
+    "UICategories",
+    "UITypes",
+    "clf_processing_elements",
     "error_delta_E",
+    "extract_archive",
+    "format_exposure_key",
     "generate_reference_colour_checker",
+    "get_sds_colour_checker",
+    "get_sds_illuminant",
+    "hash_file",
+    "list_sub_directories",
+    "mask_outliers",
+    "metadata_property",
     "optimisation_factory_IPT",
     "optimisation_factory_Oklab",
     "png_compare_colour_checkers",
-    "clf_processing_elements",
-]
-__all__ += ["IDTGeneratorProsumerCamera"]
-__all__ += [
     "slugify",
-    "list_sub_directories",
-    "mask_outliers",
+    "sort_exposure_keys",
     "working_directory",
-    "hash_file",
 ]
+
+__all__ += ["IDTProjectSettings"]
+__all__ += [
+    "GENERATORS",
+    "IDTBaseGenerator",
+    "IDTGeneratorProsumerCamera",
+]
+__all__ += ["IDTGeneratorApplication"]