+ | Action | $type_label |
+ | Full Prompt | $fullprompt |
+ | AI Engine | $ai_engine ({$request["endpoint"]}) |
+ | AI Engine Config | $engineConfig |
+ | AI Post-Performance Data | " . ($responseMetadata??"N/a") . " |
+ | Safety Parameters | " . ($requestSafety??"N/a") . " |
+ | Reported Safety | " . ($responseSafety??"N/a") . " |
+
",
+ ]
+ ]
+ ]
+ ];
+
+ return $form["PromptTesterForm"]["testdata"]["testresults"];
+ }
+
+ /**
+ * Fetch the prompts for the indicated AI action.
+ * @param $type
+ *
+ * @return array
+ */
+ private function fetchPrompts($type) {
+ $prompts = GcGenerationPrompt::getPrompts($type);
+ return $prompts;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function submitForm(array &$form, FormStateInterface $form_state) {
+ // Not required for this test form.
+ }
+
+}
diff --git a/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/GcGenerationConfig.php b/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/GcGenerationConfig.php
index 1bbed93fb5..2f84ebfa25 100644
--- a/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/GcGenerationConfig.php
+++ b/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/GcGenerationConfig.php
@@ -76,7 +76,7 @@ public function setTopP(float $value):GcGenerationConfig {
return $this;
}
public function setTopK(float $value):GcGenerationConfig {
- $this->config["topK"] = min(max($value,0),1);
+ $this->config["topK"] = min(max($value,0),40);
return $this;
}
public function setMaxOutputTokens(float $value):GcGenerationConfig {
diff --git a/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/Services/GcTextRewriter.php b/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/Services/GcTextRewriter.php
index 30b5116dd2..7b70cf37e3 100644
--- a/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/Services/GcTextRewriter.php
+++ b/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/Services/GcTextRewriter.php
@@ -200,18 +200,21 @@ public function execute(array $parameters = []): string {
$model_id = $settings["model_id"];
+ $this->response["ai_engine"] = $model_id;
$this->response[$model_id]["content"] = "";
foreach ($results as $key => $result){
if (isset($result["usageMetadata"])) {
- $this->response[$model_id]["usageMetadata"] = $results[0]["usageMetadata"] ?? [];
+ $this->response[$model_id]["usageMetadata"] = $result["usageMetadata"] ?? [];
}
- $this->loadSafetyRatings($result["candidates"][0]["safetyRatings"], $key, $model_id);
+ $this->loadSafetyRatings($result["candidates"][0]["safetyRatings"]??[], $key, $model_id);
- if (isset($result["candidates"][0]["content"]["parts"][0]["text"])) {
- $this->response[$model_id]["content"] .= $result["candidates"][0]["content"]["parts"][0]["text"];
+ foreach($result["candidates"][0]["content"]["parts"]??[] as $part) {
+ if (isset($part["text"])) {
+ $this->response[$model_id]["content"] .= $part["text"];
+ }
}
}
diff --git a/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/Services/GcTextSummarizer.php b/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/Services/GcTextSummarizer.php
index ea8ab837ac..2c07f3cf18 100644
--- a/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/Services/GcTextSummarizer.php
+++ b/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/Services/GcTextSummarizer.php
@@ -227,6 +227,7 @@ public function execute(array $parameters = []): string {
$model_id = $settings["model_id"];
+ $this->response["ai_engine"] = $model_id;
$this->response[$model_id]["content"] = "";
foreach ($results as $key => $result){
@@ -239,8 +240,10 @@ public function execute(array $parameters = []): string {
$this->loadSafetyRatings($result["candidates"][0]["safetyRatings"], $key, $model_id);
}
- if (isset($result["candidates"][0]["content"]["parts"][0]["text"])) {
- $this->response[$model_id]["content"] .= $result["candidates"][0]["content"]["parts"][0]["text"];
+ foreach($result["candidates"][0]["content"]["parts"]??[] as $part) {
+ if (isset($part["text"])) {
+ $this->response[$model_id]["content"] .= $part["text"];
+ }
}
}
diff --git a/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/Services/GcTranslation.php b/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/Services/GcTranslation.php
index ce87f41e11..965a4f913f 100644
--- a/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/Services/GcTranslation.php
+++ b/docroot/modules/custom/bos_components/modules/bos_google_cloud/src/Services/GcTranslation.php
@@ -202,18 +202,21 @@ public function execute(array $parameters = []): string {
$model_id = $settings["model_id"];
+ $this->response["ai_engine"] = $model_id;
$this->response[$model_id]["content"] = "";
- foreach ($results as $key => $result){
+ foreach ($results as $key => $result) {
if (isset($result["usageMetadata"])) {
- $this->response[$model_id]["usageMetadata"] = $results[0]["usageMetadata"] ?? [];
+ $this->response[$model_id]["usageMetadata"] = $result["usageMetadata"] ?? [];
}
- $this->loadSafetyRatings($result["candidates"][0]["safetyRatings"], $key, $model_id);
+ $this->loadSafetyRatings($result["candidates"][0]["safetyRatings"]??[], $key, $model_id);
- if (isset($result["candidates"][0]["content"]["parts"][0]["text"])) {
- $this->response[$model_id]["content"] .= $result["candidates"][0]["content"]["parts"][0]["text"];
+ foreach($result["candidates"][0]["content"]["parts"]??[] as $part) {
+ if (isset($part["text"])) {
+ $this->response[$model_id]["content"] .= $part["text"];
+ }
}
}
diff --git a/docroot/modules/custom/bos_content/modules/node_rollcall/src/Controller/node_rollcall_endpoints.http b/docroot/modules/custom/bos_content/modules/node_rollcall/src/Controller/node_rollcall_endpoints.http
index 0ea9e174b5..d3fbadb47c 100644
--- a/docroot/modules/custom/bos_content/modules/node_rollcall/src/Controller/node_rollcall_endpoints.http
+++ b/docroot/modules/custom/bos_content/modules/node_rollcall/src/Controller/node_rollcall_endpoints.http
@@ -1,6 +1,14 @@
### Load Rollcall Data -inline
-# Ensure the Taxonomies vocab_votes and vocab_districts are set up first
-# also need to set the config ("node_rollcall.settings.auth_token")
+# 1. Ensure the Taxonomies vocab_votes and vocab_districts are set up first
+# 2. Set the config ("node_rollcall.settings.auth_token")
+# 3. use an array of objects, where each object contains:
+# - docketId: integer unique ID for a docket
+# - docket: docket ID - note: ID not unique may be re-used between years
+# - subject: docket text being voted upon
+# - votedate: date/time of vote in fmt yyyy-mm-ddThh:nn:ss
+# - voteId: uniqueID for this vote (pk = councillor/docket)
+# - councillor: The councillor surname
+# - vote: typically Y, N, P, NP
POST {{host}}/rest/rollcall/upload
Content-Type: application/json
@@ -122,21 +130,22 @@ Authorization: Bearer 8e4fcc89-0546-404a-bcf9-52695683d960
# 1. Ensure the Taxonomies vocab_votes and vocab_districts are set up first
# 2. Set the config ("node_rollcall.settings.auth_token")
# 3. Filepath needs to be absolute, or relative to docroot.
+# 4. Can use - start to define the start record for importing (indexed from 0)
+# - records to defne the #records to process
POST {{host}}/rest/rollcall/upload
Content-Type: application/json
Authorization: Bearer 8e4fcc89-0546-404a-bcf9-52695683d960
{
- "file": "sites/default/files/Rollcall_History_19Mar2024.json",
- "start": 13500,
- "records": 15470
+ "file": "sites/default/files/Rollcall_History_19Mar2024.json"
}
### Export Rollcall Data -file
# NOTES:
# 1. Calling without parameters will return all records in the database
-# 2. Adding ?date=yyyy-mm-ddwill return all dockets for meetings after that date (can also use PHP relative date strings like “-5 days” etc)
+# 2. Adding ?date=yyyy-mm-dd will return all dockets for meetings after that
+# date (can also use PHP relative date strings like “-5 days” etc)
# 3. Adding ?nid=1234will return all id's with a number higher than 1234
GET {{host}}/rollcall/api/v1
diff --git a/docroot/modules/custom/bos_core/src/Controllers/Curl/BosCurlControllerBase.php b/docroot/modules/custom/bos_core/src/Controllers/Curl/BosCurlControllerBase.php
index df00131743..c21232e447 100644
--- a/docroot/modules/custom/bos_core/src/Controllers/Curl/BosCurlControllerBase.php
+++ b/docroot/modules/custom/bos_core/src/Controllers/Curl/BosCurlControllerBase.php
@@ -171,8 +171,9 @@ public function executeCurl(bool $retry = FALSE): array {
**************************/
try {
+ $time = microtime(TRUE);
$response = curl_exec($this->handle);
-
+ $this->response["elapsedTime"] = microtime(TRUE) - $time;
$this->extractHeaders( $response, $this->response["headers"]);
}