Merging in multiple changes mainly to user and fireball management

.github/workflows/automated-testing.yml

@@ -1,4 +1,4 @@
-name: automated_testing
+name: Automated Testing
 env:
   AWS_REGION: eu-west-2
 permissions:
@@ -7,10 +7,10 @@ permissions:
 
 on:
   push:
-    branches: [ dev, markmac99 ]
+    branches: [dev, markmac99]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [master]
 jobs:
   conttests:
     runs-on: thelinux
@@ -20,7 +20,7 @@ jobs:
         username: ${{ secrets.DH_LOGIN_MM }}
         password: ${{ secrets.DH_PATT_MM }}
       env:
-        BRANCH: ${{ github.head_ref || github.ref_name }} 
+        BRANCH: ${{ github.head_ref || github.ref_name }}
       volumes:
         - testdata:/data
     steps:
@@ -46,7 +46,7 @@ jobs:
   apitests:
     runs-on: ubuntu-latest
     steps:
-      - name: checkout code 
+      - name: checkout code
         uses: actions/checkout@v3
       - name: run api tests
         run: |

.github/workflows/build_tools.yml

@@ -0,0 +1,132 @@
+name: Build Fireball and Management Tools
+env:
+  AWS_REGION: eu-west-2
+permissions:
+  id-token: write
+  contents: read
+
+on:
+  push:
+    branches: [dev, markmac99, master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+jobs:
+  local_tests:
+    name: local test stage
+    runs-on: win10
+    steps:
+      - name: "☁️ checkout repository"
+        uses: actions/checkout@v4
+      - name: testing
+        run: |
+          echo "hello from test"
+          conda activate ukmon-admin
+          dir
+  build_usermgmt:
+    name: build usermanagement
+    runs-on: win10
+    needs: local_tests
+    steps:
+      - name: building
+        run: |
+          echo "running build step"
+          conda activate ukmon-admin
+          cd usermgmt\windows
+          pyinstaller ./stationMaint2.py --noconsole --onefile --windowed --icon .\camera.ico
+          dir dist
+  package_usermgmt:
+    name: package usermanagement
+    runs-on: win10
+    needs:
+      - build_usermgmt
+    steps:
+      - name: packaging
+        run: |
+          echo "packaging the app now"
+          cd usermgmt\windows\dist
+          copy ../camera.ico .
+          copy ../stationmaint.ini.sample .
+          copy ../../README.md .
+          compress-archive -path . -update -destinationpath c:\temp\ukmon_usermgmt.zip
+  release_usermgmt:
+    name: release usermanagement
+    runs-on: win10
+    needs:
+      - package_usermgmt
+    steps:
+      - name: release
+        uses: xresloader/upload-to-github-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.MM_PAT }}
+        with:
+          file: c:\temp\ukmon_usermgmt.zip
+          tags: true
+          draft: true
+          overwrite: true
+          tag_name: 2025.10.1
+          default_release_name: User Management Tool
+          default_release_body_path: usermgmt\windows\release_notes.md
+  cleanup_usermgmt:
+    name: clean up temp usermanagement files
+    runs-on: win10
+    needs:
+      - release_usermgmt
+    steps:
+      - name: delete temp usermgmt package
+        run: |
+          del c:\temp\ukmon_usermgmt.zip
+  build_fbtool:
+    name: build fbcollector
+    runs-on: win10
+    needs: local_tests
+    steps:
+      - name: building
+        run: |
+          echo "running build step"
+          conda activate fbcollector
+          cd fbCollector
+          pyinstaller ./fireballCollector.py --onefile --windowed --icon .\ukmda.ico
+  package_fbtool:
+    name: package fbcollector
+    runs-on: win10
+    needs:
+      - build_fbtool
+    steps:
+      - name: packaging
+        run: |
+          echo "packaging the app now"
+          cd fbCollector\dist
+          copy ../ukmda.ico . 
+          copy ../config.ini.sample .
+          copy ../download_events.sh . 
+          copy ../noimage.jpg . 
+          copy ../README.md . 
+          compress-archive -path . -update -destinationpath c:\temp\fbcollector.zip
+  release_fbtool:
+    name: release fbcollector
+    runs-on: win10
+    needs:
+      - package_fbtool
+    steps:
+      - name: release
+        uses: xresloader/upload-to-github-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.MM_PAT }}
+        with:
+          file: c:\temp\fbcollector.zip
+          tags: true
+          draft: true
+          overwrite: true
+          tag_name: 2025.10.1
+          default_release_name: Tools to Gather Fireball data and Manage UKMON Cameras
+          default_release_body_path: fbCollector\README.md
+  cleanup_fbtool:
+    name: clean up temp fbcollector files
+    runs-on: win10
+    needs:
+      - release_fbtool
+    steps:
+      - name: delete package
+        run: |
+          del  c:\temp\fbcollector.zip

.github/workflows/codeql-analysis.yml

@@ -13,12 +13,12 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [master]
   schedule:
-    - cron: '26 14 * * 6'
+    - cron: "26 14 * * 6"
 
 jobs:
   analyze:
@@ -32,40 +32,40 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript', 'python' ]
+        language: ["javascript", "python"]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v3
 
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
 
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+      #- run: |
+      #   make bootstrap
+      #   make release
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2

.gitignore

@@ -614,3 +614,6 @@ tests/testing/RMS/
 tests/testing/WesternMeteorPyLib/
 archive/ukmon_pylib/tests/testdata.tar.gz
 servercopybkp/*
+fbcollector/config.ini
+usermgmt/windows/stationmaint.ini
+usermgmt/windows/README.md

.vscode/c_cpp_properties.json

@@ -5,8 +5,7 @@
             "includePath": [
                 "${workspaceFolder}/**",
                 "${vcpkgRoot}/x64-windows/include",
-                "${vcpkgRoot}/x86-windows/include",
-                "e:/dev/opencv3/opencv-3.4.11/build/install/include"
+                "${vcpkgRoot}/x86-windows/include"
             ],
             "defines": [
                 "_DEBUG",

archive/containers/trajsolver/Dockerfile

@@ -1,18 +1,20 @@
 # Copyright (C) 2018-2023 Mark McIntyre
-FROM continuumio/miniconda3:4.11.0
+#FROM continuumio/miniconda3:4.11.0
+FROM continuumio/miniconda3:24.7.1-0
 
-RUN conda install -y -c conda-forge "numpy<1.25.0" scipy cython pytz pyqt
+#RUN conda install -y -c conda-forge "numpy<1.25.0" scipy cython pytz pyqt
+RUN conda install -y -c conda-forge "numpy<2" scipy cython pytz pyqt
 RUN conda install -y -c conda-forge jplephem ephem
 RUN conda install -y -c conda-forge basemap basemap-data-hires
 RUN conda install -y -c conda-forge pandas cartopy
-RUN conda install -y matplotlib=3.4.3 
+RUN conda install -y matplotlib
 RUN pip install boto3
 RUN apt-get update && apt-get -y upgrade 
 RUN conda install -y -c conda-forge numba
 
 COPY WesternMeteorPyLib/ ./WesternMeteorPyLib
-ENV PYTHONPATH ./WesternMeteorPyLib
-ENV PROJ_LIB ./
+ENV PYTHONPATH=./WesternMeteorPyLib
+ENV PROJ_LIB=./
 COPY *.py ./
 #ENV NUMPY_EXPERIMENTAL_DTYPE_API 1
 

archive/containers/trajsolver/build.ps1

@@ -17,7 +17,7 @@ write-output "building $imagename in $accid"
 $yn=read-host -prompt "update WMPL?"
 if ($yn.tolower() -eq "y") { bash -c "./update_wmpl.sh $env" } 
 
-if ($env -eq "test") { copy-item awskeys.test awskeys}
+if ($env -eq "test") { move-item awskeys.test awskeys}
 
 docker build . -t ${imagename}
 if (! $?)
@@ -26,7 +26,7 @@ if (! $?)
     exit
 }
 set-location $loc
-if ($env -eq "test") { Remove-Item awskeys}
+if ($env -eq "test") { move-item awskeys awskeys.test }
 
 $yn=read-host -prompt "upload to ECR?"
 if ($yn.tolower() -eq "y") {