Skip to content

Commit

Permalink
Merge branch 'dev/10.3.0' into issue/1616-run-first-script-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@clpetersonucf
clpetersonucf committed Oct 29, 2024
2 parents d9477f4 + 978f98b commit dc4efda
Show file tree
Hide file tree
Showing 18 changed files with 240 additions and 196 deletions.
6 changes: 5 additions & 1 deletion .env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,8 @@ LTI_KEY="materia-production-lti-key"
#GENERATION_API_KEY=
#GENERATION_API_VERSION=
#GENERATION_API_MODEL=
#GENERATION_LOG_STATS=true
#GENERATION_LOG_STATS=true

# webserver settings =======

#IS_SERVER_HTTPS=true
7 changes: 6 additions & 1 deletion docker/.env
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,9 @@ GENERATION_API_VERSION=
# required for openai
GENERATION_API_MODEL=
# not required. stat logging is set to debug threshold
GENERATION_LOG_STATS=true
GENERATION_LOG_STATS=true

# webserver environment variables

# not required, will default to true if unset. signifies if the webserver is using HTTPS or not
IS_SERVER_HTTPS=true
3 changes: 1 addition & 2 deletions fuel/app/bootstrap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
'Cache' => $materia_path.'/fuel/core/cache.php',
'Fuel\\Core\\Errorhandler' => $materia_path.'/fuel/core/errorhandler.php',
'Log' => $materia_path.'/fuel/core/log.php',
'TestCase' => $materia_path.'/fuel/core/testcase.php',
'Cookie' => $materia_path.'/fuel/core/cookie.php'
'TestCase' => $materia_path.'/fuel/core/testcase.php'
// TODO: build task that will resolve/populate all the classes in materia here
]);

Expand Down
1 change: 1 addition & 0 deletions fuel/app/classes/basetest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ protected function make_disposable_widget(string $name = 'TestWidget', bool $res
'is_editable' => true,
'in_catalog' => true,
'is_generable' => false,
'uses_prompt_generation' => false,
'restrict_publish' => $restrict_publish,
'api_version' => 2,
],
Expand Down
28 changes: 28 additions & 0 deletions fuel/app/classes/materia/api/v1.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -894,6 +894,34 @@ static public function question_set_generate($inst_id, $widget_id, $topic, $incl
}
}

/**
* Endpoint to facilitate AI text generation for widgets
*
* @param string $prompt The prompt to generate.
* @return array An array to be passed back to the widget containing the response string
*/
static public function widget_prompt_generate($prompt)
{
// verify eligibility
if ( ! Widget_Question_Generator::is_enabled()) return Msg::failure();
if (\Service_User::verify_session() !== true) return Msg::no_login();

// prompt generation & response handling
$result = Widget_Question_Generator::generate_from_prompt($prompt);
if ( ! $result instanceof Msg && is_string($result))
{
return [
'success' => true,
'response' => $result
];
}
else
{
\Log::error(print_r($result, true));
return $result;
}
}

/**
* Gets the question with the given QID or an array of questions
* with the given ids (passed as an array)
Expand Down
97 changes: 0 additions & 97 deletions fuel/app/classes/materia/fuel/core/cookie.php
View file

This file was deleted.

125 changes: 68 additions & 57 deletions fuel/app/classes/materia/widget.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,35 @@

class Widget
{
public $clean_name = '';
public $creator = '';
public $created_at = 0;
public $dir = '';
public $flash_version = 0;
public $api_version = 0;
public $height = 0;
public $id = 0;
public $is_answer_encrypted = true;
public $in_catalog = true;
public $is_editable = true;
public $is_playable = true;
public $is_qset_encrypted = true;
public $is_scalable = 0;
public $is_scorable = true;
public $is_storage_enabled = false;
public $is_generable = false;
public $package_hash = '';
public $meta_data = null;
public $name = '';
public $player = '';
public $question_types = '';
public $restrict_publish = false;
public $score_module = 'base';
public $score_screen = '';
public $width = 0;
public $creator_guide = '';
public $player_guide = '';
public $clean_name = '';
public $creator = '';
public $created_at = 0;
public $dir = '';
public $flash_version = 0;
public $api_version = 0;
public $height = 0;
public $id = 0;
public $is_answer_encrypted = true;
public $in_catalog = true;
public $is_editable = true;
public $is_playable = true;
public $is_qset_encrypted = true;
public $is_scalable = 0;
public $is_scorable = true;
public $is_storage_enabled = false;
public $is_generable = false;
public $uses_prompt_generation = false;
public $package_hash = '';
public $meta_data = null;
public $name = '';
public $player = '';
public $question_types = '';
public $restrict_publish = false;
public $score_module = 'base';
public $score_screen = '';
public $width = 0;
public $creator_guide = '';
public $player_guide = '';

public const PATHS_PLAYDATA = '_exports'.DS.'playdata_exporters.php';
public const PATHS_SCOREMOD = '_score-modules'.DS.'score_module.php';
Expand Down Expand Up @@ -90,32 +91,33 @@ public function get($id_or_clean_name)

// -------------- INIT OBJECT ---------------
$this->__construct([
'clean_name' => $w['clean_name'],
'created_at' => $w['created_at'],
'creator' => $w['creator'],
'is_answer_encrypted' => $w['is_answer_encrypted'],
'is_qset_encrypted' => $w['is_qset_encrypted'],
'flash_version' => $w['flash_version'],
'api_version' => $w['api_version'],
'height' => $w['height'],
'id' => $w['id'],
'in_catalog' => $w['in_catalog'],
'is_editable' => $w['is_editable'],
'name' => $w['name'],
'is_playable' => $w['is_playable'],
'player' => $w['player'],
'is_scorable' => $w['is_scorable'],
'is_scalable' => $w['is_scalable'],
'score_module' => $w['score_module'],
'score_screen' => $w['score_screen'],
'restrict_publish' => $w['restrict_publish'],
'is_storage_enabled' => $w['is_storage_enabled'],
'is_generable' => $w['is_generable'],
'package_hash' => $w['package_hash'],
'width' => $w['width'],
'creator_guide' => $w['creator_guide'],
'player_guide' => $w['player_guide'],
'meta_data' => static::db_get_metadata($w['id']),
'clean_name' => $w['clean_name'],
'created_at' => $w['created_at'],
'creator' => $w['creator'],
'is_answer_encrypted' => $w['is_answer_encrypted'],
'is_qset_encrypted' => $w['is_qset_encrypted'],
'flash_version' => $w['flash_version'],
'api_version' => $w['api_version'],
'height' => $w['height'],
'id' => $w['id'],
'in_catalog' => $w['in_catalog'],
'is_editable' => $w['is_editable'],
'name' => $w['name'],
'is_playable' => $w['is_playable'],
'player' => $w['player'],
'is_scorable' => $w['is_scorable'],
'is_scalable' => $w['is_scalable'],
'score_module' => $w['score_module'],
'score_screen' => $w['score_screen'],
'restrict_publish' => $w['restrict_publish'],
'is_storage_enabled' => $w['is_storage_enabled'],
'is_generable' => $w['is_generable'],
'uses_prompt_generation' => $w['uses_prompt_generation'],
'package_hash' => $w['package_hash'],
'width' => $w['width'],
'creator_guide' => $w['creator_guide'],
'player_guide' => $w['player_guide'],
'meta_data' => static::db_get_metadata($w['id']),
]);

// if creator is empty or set to 'default', use the default creator
Expand All @@ -124,8 +126,17 @@ public function get($id_or_clean_name)
$this->creator = \Config::get('materia.urls.static').'default-creator/creator.html';
}

if ( ! \Service_User::verify_session('basic_author')) $this->is_generable = '0';
else $this->is_generable = $this->is_generable == '1' && Widget_Question_Generator::is_enabled() ? '1' : '0';
// check if ai generation is available and adjust appropriate fields
if ( ! \Service_User::verify_session('basic_author'))
{
$this->is_generable = '0';
$this->uses_prompt_generation = '0';
}
else
{
$this->is_generable = $this->is_generable == '1' && Widget_Question_Generator::is_enabled() ? '1' : '0';
$this->uses_prompt_generation = $this->uses_prompt_generation == '1' && Widget_Question_Generator::is_enabled() ? '1' : '0';
}

return true;
}
Expand Down Expand Up @@ -183,7 +194,7 @@ public function get_property($prop)
->execute()[0]['value'];
}

if ($prop == 'is_generable')
if ($prop == 'is_generable' || $prop == 'uses_prompt_generation')
{
if ( ! \Service_User::verify_session('basic_author')) return '0';
elseif ( Widget_Question_Generator::is_enabled() && $val == '1') return '1';
Expand Down
47 changes: 24 additions & 23 deletions fuel/app/classes/materia/widget/installer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,29 +534,30 @@ public static function generate_install_params(array $manifest_data, string $pac
$clean_name = \Materia\Widget::make_clean_name($manifest_data['general']['name']);
$package_hash = md5_file($package_file);
$params = [
'name' => $manifest_data['general']['name'],
'created_at' => time(),
'flash_version' => $manifest_data['files']['flash_version'],
'height' => $manifest_data['general']['height'],
'width' => $manifest_data['general']['width'],
'restrict_publish' => isset($manifest_data['general']['restrict_publish']) ? Util_Validator::cast_to_bool_enum($manifest_data['general']['restrict_publish']) : '0',
'is_qset_encrypted' => Util_Validator::cast_to_bool_enum($manifest_data['general']['is_qset_encrypted']),
'is_answer_encrypted' => Util_Validator::cast_to_bool_enum($manifest_data['general']['is_answer_encrypted']),
'is_storage_enabled' => Util_Validator::cast_to_bool_enum($manifest_data['general']['is_storage_enabled']),
'is_playable' => Util_Validator::cast_to_bool_enum($manifest_data['general']['is_playable']),
'is_editable' => Util_Validator::cast_to_bool_enum($manifest_data['general']['is_editable']),
'is_scorable' => Util_Validator::cast_to_bool_enum($manifest_data['score']['is_scorable']),
'in_catalog' => Util_Validator::cast_to_bool_enum($manifest_data['general']['in_catalog']),
'is_generable' => isset($manifest_data['general']['is_generable']) ? Util_Validator::cast_to_bool_enum($manifest_data['general']['is_generable']) : '0',
'clean_name' => $clean_name,
'api_version' => (string)(int)$manifest_data['general']['api_version'],
'package_hash' => $package_hash,
'score_module' => $manifest_data['score']['score_module'],
'creator' => isset($manifest_data['files']['creator']) ? $manifest_data['files']['creator'] : '',
'player' => isset($manifest_data['files']['player']) ? $manifest_data['files']['player'] : '' ,
'score_screen' => isset($manifest_data['score']['score_screen']) ? $manifest_data['score']['score_screen'] : '',
'creator_guide' => isset($manifest_data['files']['creator_guide']) ? $manifest_data['files']['creator_guide'] : '',
'player_guide' => isset($manifest_data['files']['player_guide']) ? $manifest_data['files']['player_guide'] : ''
'name' => $manifest_data['general']['name'],
'created_at' => time(),
'flash_version' => $manifest_data['files']['flash_version'],
'height' => $manifest_data['general']['height'],
'width' => $manifest_data['general']['width'],
'restrict_publish' => isset($manifest_data['general']['restrict_publish']) ? Util_Validator::cast_to_bool_enum($manifest_data['general']['restrict_publish']) : '0',
'is_qset_encrypted' => Util_Validator::cast_to_bool_enum($manifest_data['general']['is_qset_encrypted']),
'is_answer_encrypted' => Util_Validator::cast_to_bool_enum($manifest_data['general']['is_answer_encrypted']),
'is_storage_enabled' => Util_Validator::cast_to_bool_enum($manifest_data['general']['is_storage_enabled']),
'is_playable' => Util_Validator::cast_to_bool_enum($manifest_data['general']['is_playable']),
'is_editable' => Util_Validator::cast_to_bool_enum($manifest_data['general']['is_editable']),
'is_scorable' => Util_Validator::cast_to_bool_enum($manifest_data['score']['is_scorable']),
'in_catalog' => Util_Validator::cast_to_bool_enum($manifest_data['general']['in_catalog']),
'is_generable' => isset($manifest_data['general']['is_generable']) ? Util_Validator::cast_to_bool_enum($manifest_data['general']['is_generable']) : '0',
'uses_prompt_generation' => isset($manifest_data['general']['uses_prompt_generation']) ? Util_Validator::cast_to_bool_enum($manifest_data['general']['uses_prompt_generation']) : '0',
'clean_name' => $clean_name,
'api_version' => (string)(int)$manifest_data['general']['api_version'],
'package_hash' => $package_hash,
'score_module' => $manifest_data['score']['score_module'],
'creator' => isset($manifest_data['files']['creator']) ? $manifest_data['files']['creator'] : '',
'player' => isset($manifest_data['files']['player']) ? $manifest_data['files']['player'] : '' ,
'score_screen' => isset($manifest_data['score']['score_screen']) ? $manifest_data['score']['score_screen'] : '',
'creator_guide' => isset($manifest_data['files']['creator_guide']) ? $manifest_data['files']['creator_guide'] : '',
'player_guide' => isset($manifest_data['files']['player_guide']) ? $manifest_data['files']['player_guide'] : ''
];
return $params;
}
Expand Down
Loading

0 comments on commit dc4efda

Please sign in to comment.