Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

+ link vars assembling.

Browse Source
This commit is contained in:
liwenrui
2023-07-25 11:32:56 +08:00
parent bdc2443fb7
commit a5169afd1e
2 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/ai/control.php
+5 -2
View File
@@ -441,11 +441,14 @@ class ai extends control
$prompt = $this->ai->getPromptByID($promptId);
if(empty($prompt) || !$this->ai->isExecutable($prompt)) return $this->send(array('result' => 'fail', 'message' => $this->lang->ai->execute->fail));
$response = $this->ai->executePrompt($prompt, $objectId);
$object = $this->getObjectForPromptById($prompt, $objectId);
if(empty($object)) return $this->send(array('result' => 'fail', 'message' => $this->lang->ai->execute->fail));
$response = $this->ai->executePrompt($prompt, $object);
if(empty($response)) return $this->send(array('result' => 'fail', 'message' => $this->lang->ai->execute->fail));
$this->ai->setInjectData($prompt->targetForm, $response);
$location = $this->ai->getTargetFormLocation($prompt, $objectId);
$location = $this->ai->getTargetFormLocation($prompt, $object);
if(empty($location)) return $this->send(array('result' => 'fail', 'message' => $this->lang->ai->execute->fail));
$_SESSION['auditPrompt']['prompt'] = $prompt;
module/ai/model.php
+29 -9
View File
@@ -801,19 +801,19 @@ class aiModel extends model
* Execute prompt on object.
*
* @param int|object $prompt prompt (or id) to execute.
* @param int $objectId object to execute prompt on.
* @param int|object $object object (or id) to execute prompt on.
* @access public
* @return string|false returns either JSON string or false.
*/
public function executePrompt($prompt, $objectId)
public function executePrompt($prompt, $object)
{
if(is_numeric($prompt)) $prompt = $this->getPromptById($prompt);
if(empty($prompt)) return false;
$objectForPrompt = $this->getObjectForPromptById($prompt, $objectId);
if(empty($objectForPrompt)) return false;
if(is_numeric($object)) $object = $this->getObjectForPromptById($prompt, $object);
if(empty($object)) return false;
list($objectData) = $objectForPrompt;
list($objectData) = $object;
$dataPrompt = $this->serializeDataToPrompt($prompt->module, $prompt->source, $objectData);
$wholePrompt = $this->assemblePrompt($prompt, $dataPrompt);
@@ -948,11 +948,12 @@ class aiModel extends model
* Get target form location of object for prompt.
*
* @param object|int $prompt prompt object or prompt id
* @param int $objectId
* @param object $object
* @param array $linkArgs optional, link arguments, as defined in `->args` of items of `$config->ai->targetFormVars`, e.g. array('story' => 1). If not provided, will try to get from object.
* @access public
* @return string|false returns either link or false.
*/
public function getTargetFormLocation($prompt, $objectId)
public function getTargetFormLocation($prompt, $object, $linkArgs = array())
{
if(is_numeric($prompt)) $prompt = $this->getByID($prompt);
if(empty($prompt)) return false;
@@ -962,8 +963,27 @@ class aiModel extends model
list($module, $method) = explode('.', $targetForm);
$vars = sprintf($this->config->ai->targetFormVars[$module][$method], $objectId);
return helper::createLink($module, $method, $vars);
/* Try assemble link vars from both passed-in `$linkArgs` and object props. */
$varsConfig = $this->config->ai->targetFormVars[$module][$method];
$vars = array();
foreach($varsConfig->args as $arg)
{
if(!empty($linkArgs[$arg]))
{
$vars[] = $linkArgs[$arg];
}
elseif(!empty($object->$arg))
{
$vars[] = $object->$arg;
}
else
{
$vars[] = 0;
}
}
$linkVars = vsprintf($varsConfig->format, $vars);
return helper::createLink($module, $method, $linkVars);
}
/**