Flask app

.github/workflows/python-package.yml

@@ -0,0 +1,61 @@
+name: Python package
+
+on:
+  pull_request:
+    branches: [flask_app]
+  push:
+    branches: [flask_app]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        python_version: ["3.8", "3.9", "3.10", "3.11"]
+        platform: ["ubuntu-latest", "macos-latest", "windows-latest"]
+
+    runs-on: ${{ matrix.platform }}
+
+    defaults:
+      run:
+        working-directory: ./main
+
+    steps:
+      - name: Checkout main repository
+        uses: actions/checkout@v4
+        with:
+          path: main
+
+      - name: Setup ExifTool
+        uses: actions/checkout@v4
+        with:
+          repository: "exiftool/exiftool"
+          path: exiftool
+
+      - name: Check ExifTool version
+        run: |
+          mv ${{ github.workspace }}/exiftool/exiftool ${{ github.workspace }}/exiftool/exiftool.pl
+          perl ${{ github.workspace }}/exiftool/exiftool.pl -ver
+
+      - name: Setup FFmpeg
+        uses: FedericoCarboni/setup-ffmpeg@v2
+        if: matrix.platform != 'macos-latest'
+
+      - name: Set up Python ${{ matrix.python_version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python_version }}
+
+      - name: Upgrade pip
+        run: python -m pip install --upgrade pip
+
+      - name: Install dependencies
+        run:  python -m pip install -e .
+
+
+#      - name: Test with pytest
+#        run: |
+#          mapilio_kit --version
+#          pytest -s -vv tests
+#        env:
+#          MAPILIO_KIT__TESTS_EXECUTABLE: mapilio-kit
+#          MAPILIO_KIT__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl

.github/workflows/release.yml

@@ -0,0 +1,124 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  build_and_release:
+    if: ${{ startsWith(github.ref, 'refs/tags/') }}
+
+    strategy:
+      matrix:
+        python-version: [ "3.11" ]
+        platform: ["macos-latest"] # "ubuntu-20.04","windows-latest"
+        architecture: [ "x64" ]
+        include:
+          - architecture: "x86"
+            platform: "windows-latest"
+            python-version: "3.11"
+
+    runs-on: ${{ matrix.platform }}
+
+    defaults:
+      run:
+        working-directory: ./main
+
+    steps:
+      # https://github.com/actions/checkout#Checkout-multiple-repos-side-by-side
+      - uses: actions/checkout@v4
+        with:
+          path: main
+
+      - name: Setup ExifTool
+        uses: actions/checkout@v4
+        with:
+          repository: "exiftool/exiftool"
+          path: exiftool
+
+      - name: Check ExifTool version
+        run: |
+          mv ${{ github.workspace }}/exiftool/exiftool ${{ github.workspace }}/exiftool/exiftool.pl
+          perl ${{ github.workspace }}/exiftool/exiftool.pl -ver
+
+      - name: Setup FFmpeg
+        uses: FedericoCarboni/setup-ffmpeg@v3
+
+        if: matrix.platform != 'macos-latest'
+
+      - name: Set up ${{ matrix.architecture }} Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: ${{ matrix.architecture }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install .
+
+#      - name: Validate version
+#        run: |
+#          EXPECTED_GITHUB_REF=$(mapilio_kit --version | awk '{print "refs/tags/v" $1}')
+#          if [[ "$EXPECTED_GITHUB_REF" != "$GITHUB_REF" ]]; then
+#            echo "Version mismatch: $EXPECTED_GITHUB_REF != $GITHUB_REF"
+#            exit 1
+#          fi
+#        if: matrix.platform != 'windows-latest'
+
+
+
+      - name: Build and test with Pyinstaller on MacOS
+        if: matrix.platform == 'macos-latest'
+        run: |
+          python3 -m pip install pysocks
+          python3 -m pip install pyinstaller
+          python3 -m pip install pillow
+          chmod +x ./script/build_osx
+          ./script/build_osx
+          ./dist/releases/MapilioKit-Flask-osx-arm64
+        env:
+          MAPILIO_KIT__TESTS_EXECUTABLE: ./dist/osx/mapilio-kit
+          MAPILIO_KIT__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl
+
+      - name: Build and test with Pyinstaller on Ubuntu
+        if: matrix.platform == 'ubuntu-20.04'
+        run: |
+          python3 -m pip install pysocks
+          python3 -m pip install pyinstaller
+          python3 -m pip install pillow
+          chmod +x ./script/build_linux
+          ./script/build_linux
+          chmod +x ./dist/releases/mapilio-kit--linux-x86_64
+        env:
+          MAPILIO_KIT__TESTS_EXECUTABLE: ./dist/linux/mapilio-kit
+          MAPILIO_KIT__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl
+
+      - name: Build and test with Pyinstaller on Windows
+        if: matrix.platform == 'windows-latest'
+        run: |
+          python3 -m pip install pysocks
+          python3 -m pip install pyinstaller
+          ./script/build_bootloader.ps1
+          ./script/build_win.ps1
+          if (Test-Path ./dist/win/mapilio-kit--win-32bit.exe) {
+            cp ./dist/win/mapilio-kit--win-32bit.exe mapilio-kit--win-32bit.exe
+          }
+          if (Test-Path ./dist/win/mapilio-kit--win-64bit.exe) {
+            cp ./dist/win/mapilio-kit--win-64bit.exe mapilio-kit--win-64bit.exe
+          }
+        env:
+          MAPILIO_KIT__TESTS_EXECUTABLE: mapilio-kit_WINDOWS_VERY_HARD_TO_FIND_YOU_IN_ANOTHER_DIR_SO_I_MOVE_YOU_HERE.exe
+          MAPILIO_KIT__TESTS_EXIFTOOL_EXECUTABLE: perl ${{ github.workspace }}/exiftool/exiftool.pl
+
+      - name: Release
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+        with:
+          draft: true
+          generate_release_notes: true
+          fail_on_unmatched_files: true
+          files: |
+            ./main/dist/releases/*

create_spec.py

@@ -0,0 +1,159 @@
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+def install_exiftool():
+    if sys.platform == 'linux':
+        subprocess.run(['sudo', 'apt', 'install', '-y', 'exiftool'], check=True)
+    elif sys.platform == 'darwin':
+        subprocess.run(['brew', 'install', 'exiftool'], check=True)
+    elif sys.platform == 'win32':
+        subprocess.run(['powershell', '-Command',
+                        'Set-ExecutionPolicy Bypass -Scope Process -Force; '
+                        '[System.Net.ServicePointManager]::SecurityProtocol = '
+                        '[System.Net.ServicePointManager]::SecurityProtocol -bor 3072; '
+                        'iex ((New-Object System.Net.WebClient).DownloadString(\'https://community.chocolatey.org/install.ps1\'))'],
+                       check=True)
+        subprocess.run(['choco', 'install', 'exiftool', '-y'], check=True)
+    else:
+        raise ValueError("Unsupported platform")
+
+
+def get_exiftool_path():
+    try:
+        if sys.platform == 'linux' or sys.platform == 'darwin':
+            # Unix-based systems (Linux, macOS)
+            result = subprocess.run(['which', 'exiftool'], capture_output=True, text=True)
+        elif sys.platform == 'win32':
+            # Windows
+            result = subprocess.run(['where', 'exiftool'], capture_output=True, text=True)
+        else:
+            raise ValueError("Unsupported operating system")
+
+        if result.returncode != 0:
+            raise ValueError("ExifTool not found")
+        return result.stdout.strip()
+    except subprocess.CalledProcessError as e:
+        raise ValueError(f"Error finding ExifTool: {e}")
+
+def get_installed_package_path(package_name):
+    result = subprocess.run([sys.executable, '-m', 'pip', 'show', package_name], capture_output=True, text=True)
+    if result.returncode != 0:
+        raise ValueError(f"Package {package_name} not found")
+
+    location = None
+    for line in result.stdout.splitlines():
+        if line.startswith('Location:'):
+            location = line.split(' ', 1)[1].strip()
+            break
+
+    if not location:
+        raise ValueError(f"Location not found for package {package_name}")
+
+    package_folder_name = package_name.split('-')[0]
+    package_path = Path(location) / package_folder_name
+    if package_path.exists():
+        return package_path
+
+    package_folder_name = package_name.replace('-', '_')
+    package_path = Path(location) / package_folder_name
+    if package_path.exists():
+        return package_path
+
+    package_path_with_py = package_path.with_suffix('.py')
+    if package_path_with_py.exists():
+        return package_path_with_py
+
+    if package_name == 'attrs':
+        alt_package_name = 'attr'
+        alt_package_path = Path(location) / alt_package_name
+        if alt_package_path.exists():
+            return alt_package_path
+
+    raise ValueError(f"Package path not found for {package_name}")
+
+def create_spec_file():
+    requirements_file = 'requirements.txt'
+    spec_file = 'flask_app.spec'
+    icon_file = 'mapilio_ico.ico'
+
+    current_directory = os.getcwd()
+    datas = [('templates', 'templates'), ('static', 'static'), ('mapilio_kit', 'mapilio_kit'), ('mapilio_ico.ico', 'mapilio_ico.ico')]
+    hiddenimports = ['configparser']
+
+    install_exiftool()
+    try:
+        exiftool_path = get_exiftool_path()
+        datas.append((exiftool_path, 'exiftool'))
+    except ValueError as e:
+        print(f"Warning: {e}")
+
+    with open(requirements_file) as f:
+        packages = [line.split('==')[0].strip() for line in f if line.strip() and not line.startswith('#')]
+        print(packages)
+
+    for package in packages:
+        try:
+            if package == 'ExifRead':
+                package = 'exifread'
+            package_path = get_installed_package_path(package)
+
+            package_folder_name = package.replace('-', '_')
+            hiddenimports.append(package_folder_name)
+
+            if package_folder_name == package:
+                package_data_name = package
+            else:
+                package_data_name = package_path.parts[-1]
+
+            datas.append((str(package_path), package_data_name))
+
+        except ValueError as e:
+            print(f"Warning: {e}")
+    print(datas)
+    with open(spec_file, 'w') as f:
+        f.write(f"""
+# -*- mode: python ; coding: utf-8 -*-
+
+block_cipher = None
+
+options = [("u", None, "OPTION")]
+
+a = Analysis(
+    ['flask_app.py'],
+    pathex=[SPECPATH],
+    binaries=[],
+    datas={datas},
+    hiddenimports={hiddenimports},
+    hookspath=[],
+    runtime_hooks=[],
+    excludes=[],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
+    cipher=block_cipher,
+)
+pyz = PYZ(a.pure, a.zipped_data, cipher=block_cipher)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    options,
+    a.binaries,
+    a.zipfiles,
+    a.datas,
+    [],
+    name='MapilioKit-Flask',
+    debug=False,
+    strip=False,
+    upx=True,
+    runtime_tmpdir=None,
+    console=True,
+    icon='{icon_file}'
+)
+
+app = BUNDLE(exe, name='kit-gui.app', icon='mapilio_ico.ico', bundle_identifier=None)
+""")
+
+if __name__ == "__main__":
+    create_spec_file()

docker/Dockerfile

@@ -38,3 +38,5 @@ RUN make -C /app/dependencies/max2sphere-batch -j4
 RUN cp /app/dependencies/max2sphere-batch/MAX2spherebatch /app/bin/
 
 RUN python3 -m pip install --upgrade git+https://github.com/mapilio/mapilio-kit
+
+RUN git clone -b flask_app https://github.com/mapilio/mapilio-kit.git

docker/docker-compose.yml

@@ -1,10 +1,9 @@
-version: '3'
 services:
-  kit:
+  mapiliokit:
     image: kit
     container_name: kit
     build: .
     stdin_open: true
     tty: true
-    volumes:
-      - <your_local_videos_path>:/app/data/
+    ports:
+      - "8080:8080"