Skip to content

Commit

Permalink
included dependency requirements with menu
Browse files Browse the repository at this point in the history
  • Loading branch information
MIKEINTOSHSYSTEMS committed Jul 13, 2024
1 parent 2d1f6ba commit 457988a
Show file tree
Hide file tree
Showing 18 changed files with 1,339 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
*.xlsx
*.txt
!mysql-init/init.sql
!/ai/chat/requirements.txt
/ai/venv
13 changes: 13 additions & 0 deletions ai/chat/.streamlit/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# .streamlit/config.toml

[theme]
base = "light"
primaryColor = "#E694FF"
backgroundColor = "#FFFFFF"
secondaryBackgroundColor = "#FFFFFF"
textColor = "#black"
font = "sans-serif"

[server]
sslCertFile = '/ai/chat/certs/fullchain.pem'
sslKeyFile = '/ai/chat/certs/privkey.pem'
49 changes: 49 additions & 0 deletions ai/chat/certs/fullchain.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
-----BEGIN CERTIFICATE-----
MIIDmTCCAyCgAwIBAgISBHaXIJvis3sz9+iNBTRqjRkUMAoGCCqGSM49BAMDMDIx
CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF
NTAeFw0yNDA2MDcyMzA3MjZaFw0yNDA5MDUyMzA3MjVaMCgxJjAkBgNVBAMTHWRl
cmVqYXZpei5tZXJxY29uc3VsdGFuY3kub3JnMFkwEwYHKoZIzj0CAQYIKoZIzj0D
AQcDQgAEmHJZzi2XB7FcPHoqpxbYdDpYQRVK11ATOk3Qn3QCuuc/AQzYDfiqDqBW
Y0AXJ4ZvHLXGJe0x9iJo39ffnRXEBqOCAh4wggIaMA4GA1UdDwEB/wQEAwIHgDAd
BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
HQ4EFgQUnZmBWS5LLjFrQ0j++fM5JP/26pEwHwYDVR0jBBgwFoAUnytfzzwhT50E
t+0rLMTGcIvS1w0wVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8v
ZTUuby5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9lNS5pLmxlbmNyLm9y
Zy8wKAYDVR0RBCEwH4IdZGVyZWphdml6Lm1lcnFjb25zdWx0YW5jeS5vcmcwEwYD
VR0gBAwwCjAIBgZngQwBAgEwggEDBgorBgEEAdZ5AgQCBIH0BIHxAO8AdgBIsONr
2qZHNA/lagL6nTDrHFIBy1bdLIHZu7+rOdiEcwAAAY/1K+v3AAAEAwBHMEUCIQC4
iINzKme7CITUgLDs1m8LCCZDSejjjVCn+TYq1u8QbwIgJPiK3MoVcQYHtYKJMInG
le9GKRW+U8sDkOpIggskfNgAdQAZmBBxCfDWUi4wgNKeP2S7g24ozPkPUo7u385K
Pxa0ygAAAY/1K+vIAAAEAwBGMEQCIDnhMYsUfMjQwCeBNlbq80sQE+gd2Cv47P2x
//34TLFxAiBHpP/1ZMwRe5jNX61wmQTaSHklnyezL+9QwgUh+BuMGzAKBggqhkjO
PQQDAwNnADBkAjBKIL0lxp/tCPdg42TyDD04qXPrX276rLpt22JObnzihRTKdfiI
W0gmIHlYUvD6d6sCMAKRjm/5kjnEiWh/Jc9orAX5Pl/PGsJYV1ehjs6VUvBW1P6e
pb9aSR11hz/jPQsYDw==
-----END CERTIFICATE-----

-----BEGIN CERTIFICATE-----
MIIEVzCCAj+gAwIBAgIRAIOPbGPOsTmMYgZigxXJ/d4wDQYJKoZIhvcNAQELBQAw
TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw
WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
RW5jcnlwdDELMAkGA1UEAxMCRTUwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNCzqK
a2GOtu/cX1jnxkJFVKtj9mZhSAouWXW0gQI3ULc/FnncmOyhKJdyIBwsz9V8UiBO
VHhbhBRrwJCuhezAUUE8Wod/Bk3U/mDR+mwt4X2VEIiiCFQPmRpM5uoKrNijgfgw
gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSfK1/PPCFPnQS37SssxMZw
i9LXDTAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g
BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu
Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAH3KdNEVCQdqk0LKyuNImTKdRJY1C
2uw2SJajuhqkyGPY8C+zzsufZ+mgnhnq1A2KVQOSykOEnUbx1cy637rBAihx97r+
bcwbZM6sTDIaEriR/PLk6LKs9Be0uoVxgOKDcpG9svD33J+G9Lcfv1K9luDmSTgG
6XNFIN5vfI5gs/lMPyojEMdIzK9blcl2/1vKxO8WGCcjvsQ1nJ/Pwt8LQZBfOFyV
XP8ubAp/au3dc4EKWG9MO5zcx1qT9+NXRGdVWxGvmBFRAajciMfXME1ZuGmk3/GO
koAM7ZkjZmleyokP1LGzmfJcUd9s7eeu1/9/eg5XlXd/55GtYjAM+C4DG5i7eaNq
cm2F+yxYIPt6cbbtYVNJCGfHWqHEQ4FYStUyFnv8sjyqU8ypgZaNJ9aVcWSICLOI
E1/Qv/7oKsnZCWJ926wU6RqG1OYPGOi1zuABhLw61cuPVDT28nQS/e6z95cJXq0e
K1BcaJ6fJZsmbjRgD5p3mvEf5vdQM7MCEvU0tHbsx2I5mHHJoABHb8KVBgWp/lcX
GWiWaeOyB7RP+OfDtvi2OsapxXiV7vNVs7fMlrRjY1joKaqmmycnBvAq14AEbtyL
sVfOS66B8apkeFX2NY4XPEYV4ZSCe8VHPrdrERk2wILG3T/EGmSIkCYVUMSnjmJd
VQD9F6Na/+zmXCc=
-----END CERTIFICATE-----
5 changes: 5 additions & 0 deletions ai/chat/certs/privkey.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-----BEGIN EC PRIVATE KEY-----
MHcCAQEEIJsy/gmQ1FqOLOHP6RXOnzJHk26pU23f/I9uUQAveo7toAoGCCqGSM49
AwEHoUQDQgAEmHJZzi2XB7FcPHoqpxbYdDpYQRVK11ATOk3Qn3QCuuc/AQzYDfiq
DqBWY0AXJ4ZvHLXGJe0x9iJo39ffnRXEBg==
-----END EC PRIVATE KEY-----
13 changes: 13 additions & 0 deletions ai/chat/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
streamlit==1.36.0
langchain==0.1.8
langchain-community==0.0.21
langchain-core==0.1.24
langchain-openai==0.0.6
mysql-connector-python==8.3.0
groq==0.4.2
langchain-groq==0.0.1
python-dotenv==1.0.0
matplotlib==3.5.1
pandas==1.4.1
seaborn==0.11.2
altair==5.3.0
2 changes: 2 additions & 0 deletions ai/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,7 @@ services:
retries: 3
volumes:
- ./chat:/chat
- ./chat/certs:/ai/chat/certs # Mount the SSL certificates directory
- ./chat/.streamlit/config.toml:/root/.streamlit/config.toml # Mount the config.toml file
environment:
- PYTHONUNBUFFERED=1
4 changes: 2 additions & 2 deletions app/include/appsettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -751,9 +751,9 @@
$strLastSQL = "";
$showCustomMarkerOnPrint = false;

$projectBuildKey = "453_1719945635";
$projectBuildKey = "455_1720894866";
$wizardBuildKey = "39558";
$projectBuildNumber = "453";
$projectBuildNumber = "455";

$mlang_messages = array();
$mlang_charsets = array();
Expand Down
16 changes: 16 additions & 0 deletions app/include/events.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ function __construct()
$this->events["Form_Submissions"] = true;
$this->events["utilities_snippet5"] = true;
$this->events["career_compass_submissions"] = true;
$this->events["utilities_snippet6"] = true;



Expand Down Expand Up @@ -313,6 +314,21 @@ function event_career_compass_submissions(&$params)
</IFRAME>';

;
}
function event_utilities_snippet6(&$params)
{
echo '<IFRAME SRC="https://derejaviz.merqconsultancy.org:8502" WIDTH=100% HEIGHT=900px>
If you can see this, your browser does not
understand IFRAME. However, we willl still
<A HREF="../test.php">link</A>
you to the file.
</IFRAME>';
;
}

Expand Down
80 changes: 79 additions & 1 deletion app/include/menunodes_DerejaMenuSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -2945,6 +2945,32 @@ function getMenuNodes_DerejaMenuSet($menuNodesObject)
$menuNodesObject->menuNodes["DerejaMenuSet"][] = $menuNode;
$menuNode = array();
$menuNode["id"] = "114";
$menuNode["name"] = "-------";
$menuNode["href"] = "";
$menuNode["type"] = "Separator";
$menuNode["table"] = "";
$menuNode["style"] = "";
$menuNode["params"] = "";
$menuNode["parent"] = "0";
$menuNode["nameType"] = "Text";
$menuNode["linkType"] = "None";
$menuNode["pageType"] = strtolower("");//
$menuNode["pageId"] = "";
$menuNode["openType"] = "None";

$menuNode["icon"] = "";
$menuNode["iconType"] = "0";
$menuNode["iconShow"] = "1";

$menuNode["color"] = "";

$menuNode["title"] = "-------";



$menuNodesObject->menuNodes["DerejaMenuSet"][] = $menuNode;
$menuNode = array();
$menuNode["id"] = "115";
$menuNode["name"] = "Knowledge Base";
$menuNode["href"] = "./modules/knowledgebase/main_list.php";
$menuNode["type"] = "Leaf";
Expand All @@ -2970,7 +2996,7 @@ function getMenuNodes_DerejaMenuSet($menuNodesObject)

$menuNodesObject->menuNodes["DerejaMenuSet"][] = $menuNode;
$menuNode = array();
$menuNode["id"] = "115";
$menuNode["id"] = "116";
$menuNode["name"] = "Help Desk";
$menuNode["href"] = "./modules/helpdesk/menu.php";
$menuNode["type"] = "Leaf";
Expand All @@ -2994,6 +3020,58 @@ function getMenuNodes_DerejaMenuSet($menuNodesObject)



$menuNodesObject->menuNodes["DerejaMenuSet"][] = $menuNode;
$menuNode = array();
$menuNode["id"] = "117";
$menuNode["name"] = "-------";
$menuNode["href"] = "";
$menuNode["type"] = "Separator";
$menuNode["table"] = "";
$menuNode["style"] = "";
$menuNode["params"] = "";
$menuNode["parent"] = "0";
$menuNode["nameType"] = "Text";
$menuNode["linkType"] = "None";
$menuNode["pageType"] = strtolower("");//
$menuNode["pageId"] = "";
$menuNode["openType"] = "None";

$menuNode["icon"] = "";
$menuNode["iconType"] = "0";
$menuNode["iconShow"] = "1";

$menuNode["color"] = "";

$menuNode["title"] = "-------";



$menuNodesObject->menuNodes["DerejaMenuSet"][] = $menuNode;
$menuNode = array();
$menuNode["id"] = "118";
$menuNode["name"] = "MERQ-AI Data Assistant";
$menuNode["href"] = "mypage.htm";
$menuNode["type"] = "Leaf";
$menuNode["table"] = "utilities";
$menuNode["style"] = "";
$menuNode["params"] = "";
$menuNode["parent"] = "0";
$menuNode["nameType"] = "Text";
$menuNode["linkType"] = "Internal";
$menuNode["pageType"] = strtolower("List");//
$menuNode["pageId"] = "merq_ai_data_assistant";
$menuNode["openType"] = "None";

$menuNode["icon"] = "fa-wechat";
$menuNode["iconType"] = "3";
$menuNode["iconShow"] = "1";

$menuNode["color"] = "";

$menuNode["title"] = "MERQ-AI Data Assistant";



$menuNodesObject->menuNodes["DerejaMenuSet"][] = $menuNode;
}
?>
Loading

0 comments on commit 457988a

Please sign in to comment.