commit

Author: phrocker

ai-agent/src/main/java/io/sentrius/agent/analysis/agents/verbs/AgentVerbs.java

@@ -44,7 +44,6 @@
 import io.sentrius.sso.genai.Response;
 import io.sentrius.sso.genai.model.LLMRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -189,7 +188,7 @@ public String justifyAgent(AgentExecution execution, ZtatRequestDTO ztatRequest,
 
                 if (commsIds.size() > 1) {
                     // get the first one
-                    throw new RuntimeException("have more than one");
+                    log.info("CommsIds is {}", commsIds);
                 }
 
 
@@ -436,7 +435,7 @@ public List<ZtatAsessment> analyzeAtatRequests(AgentExecution execution, List<At
                         log.info("We have a question");
                         // ask a question of the user
                         String payload = JsonUtil.MAPPER.writeValueAsString(ztat);
-                        var comm = agentClientService.askQuestion(execution,request,payload);
+                        var comm = agentClientService.askAgent(execution,request,payload);
                         log.info("Question is {}", comm);
                         var newComms = agentClientService.getResponse(execution,request,comm, 60,
                             java.util.concurrent.TimeUnit.SECONDS);

ai-agent/src/main/resources/respond-ztat.json

@@ -1,6 +1,4 @@
-[
-  {
+ {
     "requestId": "<id>",
     "justificationToAgent": "<Justification for why your operation should be approved, responding to the question asked by the agent>",
-  }
-]
+  }

api/src/main/java/io/sentrius/sso/controllers/api/AgentApiController.java

@@ -306,7 +306,7 @@ public ResponseEntity<?> getConnections(
         log.info("Received policy request from agent: {} {} {} {}",agent, aid, agentId, operatingUser);
 
         var agents = agentService.getCommunications(operatingUser.getUsername(), start, end, pageable);
-        return ResponseEntity.ok(agents);
+        return ResponseEntity.ok(agents.map(AgentCommunication::toDTO));
     }
 
     @GetMapping("/policy")

core/src/main/java/io/sentrius/sso/core/services/agents/AgentClientService.java

@@ -140,17 +140,19 @@ public List<AgentCommunicationDTO> getResponse(AgentExecution execution, ZtatReq
         return List.of();
     }
 
-    public AgentCommunicationDTO askQuestion(AgentExecution execution, AtatRequest atatRequest, String payload)
+    public AgentCommunicationDTO askAgent(AgentExecution execution, AtatRequest atatRequest, String payload)
         throws ZtatException, TimeoutException, JsonProcessingException {
         // pose a question to the user and then wait for a response a reasonable amount of time.
         String ask = "/agent/chat/atat/send";
 
+
         AgentCommunicationDTO myQuestion = AgentCommunicationDTO.builder()
             .payload(payload)
             .messageType("atat_chat_ask")
             .sourceAgent(execution.getUser().getUsername())
             .targetAgent(atatRequest.getUserName())
             .build();
+        log.info("My question is {}",myQuestion);
         var acommResponse = zeroTrustClientService.callPostOnApi(execution, ask, myQuestion,
             Maps.immutableEntry("requestId", List.of(atatRequest.getRequestId())));
         return JsonUtil.MAPPER.readValue(acommResponse, AgentCommunicationDTO.class);

core/src/main/java/io/sentrius/sso/core/services/agents/ZeroTrustClientService.java

@@ -517,7 +517,7 @@ public void approveZtat(AgentExecution execution, String requestId) throws JsonP
 
         ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, requestEntity, String.class);
 
-        if (response.getStatusCode().is2xxSuccessful() && response.getBody() != null) {
+        if (response.getStatusCode().is2xxSuccessful()) {
             log.info("successfully approved ZTAT: {}", requestId);
         } else {
             throw new RuntimeException("Failed to obtain ZTAT: " + response.getStatusCode());

dataplane/src/main/java/io/sentrius/sso/core/model/chat/AgentCommunication.java

@@ -4,6 +4,8 @@
 
 import java.util.List;
 import java.util.UUID;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import io.sentrius.sso.core.dto.AgentCommunicationDTO;
 import io.sentrius.sso.core.model.zt.RequestCommunicationLink;
 import jakarta.persistence.Basic;
 import jakarta.persistence.CascadeType;
@@ -55,5 +57,19 @@ public class AgentCommunication {
     private java.time.Instant createdAt = java.time.Instant.now();
 
     @OneToMany(mappedBy = "communication", cascade = CascadeType.ALL, orphanRemoval = true)
+    @JsonManagedReference // <-- ADD THIS
     private List<RequestCommunicationLink> linkedRequests;
+
+    public AgentCommunicationDTO toDTO(){
+        return AgentCommunicationDTO.builder()
+                .id(this.id)
+                .sourceAgent(this.sourceAgent)
+                .targetAgent(this.targetAgent)
+                .messageType(this.messageType)
+                .communicationId(this.communicationId)
+                .payload(this.payload)
+                .createdAt(this.createdAt)
+                .linkedRequests(linkedRequests.stream().map(RequestCommunicationLink::getId).toList())
+                .build();
+    }
 }

dataplane/src/main/java/io/sentrius/sso/core/model/zt/RequestCommunicationLink.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonManagedReference;
 import io.sentrius.sso.core.model.chat.AgentCommunication;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -49,6 +50,7 @@ public class RequestCommunicationLink {
 
     @ManyToOne(fetch = FetchType.LAZY, optional = false)
     @JoinColumn(name = "communication_id", nullable = false)
+    @JsonManagedReference // <-- ADD THIS
     private AgentCommunication communication;
 
     @Column(name = "created_at", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")