Merge pull request #5 from starwit/feature/ab#1642-count-detection

Feature/ab#1642 count detection

Author: witchpou

.github/dependabot.yml

@@ -0,0 +1,25 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    target-branch: main
+    schedule:
+      interval: "weekly"
+    groups:
+      pip-deps:
+        patterns:
+          - "*"
+  # Enable version updates for Docker
+  - package-ecosystem: "docker"
+    # Look for a `Dockerfile` in the `root` directory
+    directory: "/"
+    target-branch: main
+    # Check for updates once a week
+    schedule:
+      interval: "weekly"
+

.github/workflows/pr-build.yml

@@ -0,0 +1,39 @@
+name: PR Build
+
+# PR build
+
+on:
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+
+
+# just runs Maven, NPM and Docker build
+jobs:
+  build:
+    name: "Install software"
+    runs-on: [self-hosted, linux, X64]
+
+    steps:
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        distribution: 'temurin'
+        java-version: 21
+
+    - name: Set up Maven
+      uses: stCarolas/setup-maven@v5
+      with:
+         maven-version: 3.9.2        
+
+    - name: checkout
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: '0'
+
+    - run: mvn --version
+
+    - name: java mvn build
+      run: | 
+        cd java/visionapi
+        mvn clean install

.gitignore

@@ -1 +1,2 @@
-.vscode
+.vscode
+.venv

Makefile

@@ -17,5 +17,5 @@ java:
 	(cd java/visionapi && mvn versions:set -DgenerateBackupPoms=false -DnewVersion=$(VERSION))
 
 readme:
-	sed -E 's|tag = "[0-9\.]+"|tag = "$(VERSION)"|' -i Readme.md
-	sed -E 's|<version>[0-9\.]+</version>|<version>$(VERSION)</version>|' -i Readme.md
+	sed -E 's|tag = "[0-9\.]+"|tag = "$(VERSION)"|' -i README.md
+	sed -E 's|<version>[0-9\.]+</version>|<version>$(VERSION)</version>|' -i README.md

Readme.md README.mdReadme.md renamed to README.md

@@ -6,15 +6,15 @@ This repo contains the main data model for the Starwit Awareness Engine (SAE). S
 
 ### Python / Poetry
 - Add the following to your `pyproject.toml` dependencies section\
-    `visionapi = { git = "https://github.com/starwit/vision-api.git", subdirectory = "python/visionapi", tag = "3.2.0" }`
+    `visionapi = { git = "https://github.com/starwit/vision-api.git", subdirectory = "python/visionapi", tag = "3.2.1" }`
 
 ### Java / Maven
 - Add dependency to your project:
     ```xml
     <dependency>
       <groupId>de.starwit</groupId>
       <artifactId>vision-api</artifactId>
-      <version>3.2.0</version>
+      <version>3.2.1</version>
     </dependency>
     ```
 - Add maven repository to your `~/.m2/settings.xml` (adapt example / your config as necessary):
@@ -58,6 +58,15 @@ This repo contains the main data model for the Starwit Awareness Engine (SAE). S
 
     ```
 
+## Tools & Setup
+
+* Install protoc via pipx:
+    ```
+    sudo apt install pipx
+    pipx install protoc-wrapper==31.1.0
+    ```
+* ! if youchange protoc version, you need to change protobuf version in `java\visionapi\pom.xml` and `python\visionapi\pyproject.toml`
+
 ## How-To Update
 1. Make desired changes in `./visionapi`
 2. Increase version in `./VERSION`
@@ -72,11 +81,10 @@ This repo contains the main data model for the Starwit Awareness Engine (SAE). S
     git push <version_tag>
     ```
 
-## Tools & Setup
-ProtoBuf compiler can be downloaded here:
-https://github.com/protocolbuffers/protobuf/releases
-
 ## Changelog
+### 3.2.1
+- Add `DetectionCountMessage` to summarize detection data
+
 ### 3.2.0
 - Add `source_id` to messages (to distinguish which source the messages are generated from)
     - Add `IncidentMessage.source_id`

VERSION

@@ -1 +1 @@
-3.2.0
+3.2.1

java/visionapi/pom.xml

@@ -6,7 +6,7 @@
   <artifactId>vision-api</artifactId>
 
   <packaging>jar</packaging>
-  <version>3.2.0</version>
+  <version>3.2.1</version>
   <name>visionapi</name>
   <url>https://github.com/starwit/vision-api</url>
 
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>4.27.3</version>
+      <version>4.31.1</version>
     </dependency>
   </dependencies>
 </project>