Skip to content

Commit 1dc32b5

Browse files
phrockerphrocker
authored
Merge pull request #38 from SentriusLLC/issue15
intermediate resolution to solve Issue#15
2 parents 21ca083 + d5f115d commit 1dc32b5

File tree

629 files changed

+32894
-2948
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

629 files changed

+32894
-2948
lines changed

‎.env‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
SENTRIUS_VERSION=1.0.8
2-
SENTRIUS_SSH_VERSION=1.0.1
3-
SENTRIUS_KEYCLOAK_VERSION=1.0.1
4-
SENTRIUS_AGENT_VERSION=1.0.9
1+
SENTRIUS_VERSION=1.1.38
2+
SENTRIUS_SSH_VERSION=1.1.4
3+
SENTRIUS_KEYCLOAK_VERSION=1.1.6
4+
SENTRIUS_AGENT_VERSION=1.1.4
5+
SENTRIUS_AI_AGENT_VERSION=1.1.18
6+
LLMPROXY_VERSION=1.0.4

‎.gcp.env‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
SENTRIUS_VERSION=1.0.45
2-
SENTRIUS_SSH_VERSION=1.0.4
3-
SENTRIUS_KEYCLOAK_VERSION=1.0.7
4-
SENTRIUS_AGENT_VERSION=1.0.18
1+
SENTRIUS_VERSION=1.0.48
2+
SENTRIUS_SSH_VERSION=1.0.7
3+
SENTRIUS_KEYCLOAK_VERSION=1.0.10
4+
SENTRIUS_AGENT_VERSION=1.0.19
5+
SENTRIUS_AI_AGENT_VERSION=1.0.0
6+
LLMPROXY_VERSION=1.0.0

‎.gcp.env.bak‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
SENTRIUS_VERSION=1.0.47
2+
SENTRIUS_SSH_VERSION=1.0.6
3+
SENTRIUS_KEYCLOAK_VERSION=1.0.9
4+
SENTRIUS_AGENT_VERSION=1.0.18

‎.gitignore‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,16 @@ core/target/**
3636
java-agent/target/**
3737
core/target/
3838
java-agent/target/
39+
ai-agent/target/**
40+
ai-agent/target/
41+
analytics/target/**
42+
analytics/target/
43+
dataplane/target/**
44+
dataplane/target/
45+
llm-proxy/target/**
46+
llm-proxy/target/
47+
llm-dataplane/target/**
48+
llm-dataplane/target/
3949
node/*
4050
node_modules/*
4151
api/node_modules/*
@@ -50,4 +60,4 @@ api/node_modules/*
5060

5161
.settings/*
5262
.env.bak
53-
.gcp.env.bak
63+
cp.env.bak

java-agent/.mvn/jvm.config renamed to Dockerfile-jaeger

File renamed without changes.

java-agent/.mvn/maven.config renamed to ai-agent/.mvn/jvm.config

File renamed without changes.

‎ai-agent/.mvn/maven.config‎

Whitespace-only changes.

‎ai-agent/pom.xml‎

Lines changed: 216 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,216 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<artifactId>sentrius</artifactId>
6+
<groupId>io.sentrius</groupId>
7+
<version>1.0.0-SNAPSHOT</version>
8+
</parent>
9+
10+
<groupId>analysis</groupId>
11+
<artifactId>ai-agent</artifactId>
12+
<version>1.0-SNAPSHOT</version>
13+
14+
<name>ai-agent</name>
15+
<url>http://www.sentrius.io</url>
16+
17+
<properties>
18+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19+
<maven.compiler.release>17</maven.compiler.release>
20+
</properties>
21+
22+
<dependencyManagement>
23+
<dependencies>
24+
<dependency>
25+
<groupId>org.junit</groupId>
26+
<artifactId>junit-bom</artifactId>
27+
<version>5.11.0</version>
28+
<type>pom</type>
29+
<scope>import</scope>
30+
</dependency>
31+
</dependencies>
32+
</dependencyManagement>
33+
34+
<dependencies>
35+
<dependency>
36+
<groupId>io.sentrius</groupId>
37+
<artifactId>sentrius-core</artifactId>
38+
<version>1.0.0-SNAPSHOT</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>io.sentrius</groupId>
42+
<artifactId>sentrius-llm-core</artifactId>
43+
<version>1.0.0-SNAPSHOT</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>io.jsonwebtoken</groupId>
47+
<artifactId>jjwt-api</artifactId>
48+
</dependency>
49+
<dependency>
50+
<groupId>io.jsonwebtoken</groupId>
51+
<artifactId>jjwt-impl</artifactId>
52+
<scope>runtime</scope>
53+
</dependency>
54+
<dependency>
55+
<groupId>io.jsonwebtoken</groupId>
56+
<artifactId>jjwt-jackson</artifactId> <!-- or jjwt-gson -->
57+
<scope>runtime</scope>
58+
</dependency>
59+
<dependency>
60+
<groupId>org.junit.jupiter</groupId>
61+
<artifactId>junit-jupiter-api</artifactId>
62+
<scope>test</scope>
63+
</dependency>
64+
<!-- Optionally: parameterized tests support -->
65+
<dependency>
66+
<groupId>org.junit.jupiter</groupId>
67+
<artifactId>junit-jupiter-params</artifactId>
68+
<scope>test</scope>
69+
</dependency>
70+
71+
<dependency>
72+
<groupId>org.springframework.boot</groupId>
73+
<artifactId>spring-boot-starter-actuator</artifactId>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.postgresql</groupId>
77+
<artifactId>postgresql</artifactId>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.flywaydb</groupId>
81+
<artifactId>flyway-database-postgresql</artifactId>
82+
</dependency>
83+
<dependency>
84+
<groupId>org.projectlombok</groupId>
85+
<artifactId>lombok</artifactId>
86+
</dependency>
87+
<dependency>
88+
<groupId>io.github.classgraph</groupId>
89+
<artifactId>classgraph</artifactId>
90+
</dependency>
91+
<!-- OpenTelemetry API + SDK -->
92+
<dependency>
93+
<groupId>io.opentelemetry</groupId>
94+
<artifactId>opentelemetry-api</artifactId>
95+
</dependency>
96+
<dependency>
97+
<groupId>io.opentelemetry</groupId>
98+
<artifactId>opentelemetry-sdk</artifactId>
99+
</dependency>
100+
101+
<!-- OpenTelemetry instrumentation for Spring Boot -->
102+
<dependency>
103+
<groupId>io.opentelemetry.instrumentation</groupId>
104+
<artifactId>opentelemetry-spring-boot-starter</artifactId>
105+
</dependency>
106+
107+
<!-- Export to OTLP (OpenTelemetry Protocol) -->
108+
<dependency>
109+
<groupId>io.opentelemetry</groupId>
110+
<artifactId>opentelemetry-exporter-otlp</artifactId>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.mockito</groupId>
114+
<artifactId>mockito-junit-jupiter</artifactId>
115+
<scope>test</scope>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.junit.jupiter</groupId>
119+
<artifactId>junit-jupiter</artifactId>
120+
<scope>test</scope>
121+
</dependency>
122+
<dependency>
123+
<groupId>org.junit.jupiter</groupId>
124+
<artifactId>junit-jupiter-engine</artifactId>
125+
<scope>test</scope>
126+
</dependency>
127+
<dependency>
128+
<groupId>org.junit.jupiter</groupId>
129+
<artifactId>junit-jupiter-api</artifactId>
130+
<scope>test</scope>
131+
</dependency>
132+
133+
</dependencies>
134+
135+
<build>
136+
<pluginManagement>
137+
<plugins>
138+
<plugin>
139+
<groupId>com.github.eirslett</groupId>
140+
<artifactId>frontend-maven-plugin</artifactId>
141+
<version>1.13.4</version>
142+
<executions>
143+
<execution>
144+
<id>install node and npm</id>
145+
<goals>
146+
<goal>install-node-and-npm</goal>
147+
</goals>
148+
<phase>generate-resources</phase>
149+
</execution>
150+
<execution>
151+
<id>npm install</id>
152+
<goals>
153+
<goal>npm</goal>
154+
</goals>
155+
<phase>generate-resources</phase>
156+
<configuration>
157+
<arguments>clean-install</arguments>
158+
</configuration>
159+
</execution>
160+
<execution>
161+
<id>grunt build</id>
162+
<goals>
163+
<goal>grunt</goal>
164+
</goals>
165+
<phase>generate-resources</phase>
166+
</execution>
167+
</executions>
168+
<configuration>
169+
<nodeVersion>v16.13.1</nodeVersion>
170+
</configuration>
171+
</plugin>
172+
<plugin>
173+
<groupId>org.springframework.boot</groupId>
174+
<artifactId>spring-boot-maven-plugin</artifactId>
175+
<!-- execution needed if using spring boot as BOM and not as parent -->
176+
<executions>
177+
<execution>
178+
<id>repackage</id>
179+
<goals>
180+
<goal>repackage</goal>
181+
</goals>
182+
</execution>
183+
</executions>
184+
</plugin>
185+
<plugin>
186+
<artifactId>maven-compiler-plugin</artifactId>
187+
</plugin>
188+
189+
<plugin>
190+
<artifactId>maven-clean-plugin</artifactId>
191+
</plugin>
192+
<plugin>
193+
<artifactId>maven-resources-plugin</artifactId>
194+
</plugin>
195+
<plugin>
196+
<artifactId>maven-surefire-plugin</artifactId>
197+
</plugin>
198+
<plugin>
199+
<artifactId>maven-jar-plugin</artifactId>
200+
</plugin>
201+
<plugin>
202+
<artifactId>maven-install-plugin</artifactId>
203+
</plugin>
204+
<plugin>
205+
<artifactId>maven-deploy-plugin</artifactId>
206+
</plugin>
207+
<plugin>
208+
<artifactId>maven-site-plugin</artifactId>
209+
</plugin>
210+
<plugin>
211+
<artifactId>maven-project-info-reports-plugin</artifactId>
212+
</plugin>
213+
</plugins>
214+
</pluginManagement>
215+
</build>
216+
</project>

‎ai-agent/src/main/java/io/sentrius/agent/analysis/AiAgent.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package io.sentrius.agent.analysis;
2+
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.scheduling.annotation.EnableScheduling;
6+
7+
8+
@SpringBootApplication(scanBasePackages = {"io.sentrius.agent", "io.sentrius.sso"},
9+
exclude = {
10+
org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration.class,
11+
org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration.class,
12+
org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration.class
13+
})
14+
@EnableScheduling
15+
public class AiAgent {
16+
public static void main(String[] args) {
17+
SpringApplication.run(AiAgent.class, args);
18+
}
19+
}

‎ai-agent/src/main/java/io/sentrius/agent/analysis/agents/agents/AgentConfig.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package io.sentrius.agent.analysis.agents.agents;
2+
3+
import java.util.ArrayList;
4+
import java.util.List;
5+
import com.fasterxml.jackson.annotation.JsonProperty;
6+
import lombok.AllArgsConstructor;
7+
import lombok.Builder;
8+
import lombok.Data;
9+
import lombok.Getter;
10+
import lombok.NoArgsConstructor;
11+
import lombok.ToString;
12+
13+
@Builder
14+
@Getter
15+
@Data
16+
@ToString
17+
@AllArgsConstructor
18+
@NoArgsConstructor
19+
public class AgentConfig {
20+
@JsonProperty(required=false)
21+
@Builder.Default
22+
private List<String> roles = new ArrayList<>();
23+
@JsonProperty(required=false)
24+
private String description;
25+
@JsonProperty(required=true)
26+
private String context;
27+
28+
// getters and setters
29+
}

0 commit comments

Comments
 (0)