Removed some print statements that were not needed, improved multibot and added ssl support to REST and HTTP clients

Author: keiffster

bots/servusai/console/config.yaml

@@ -8,21 +8,6 @@ bot:
     exit_response: So long, and thanks for the fish!
     exit_response_srai: YEXITRESPONSE
 
-    override_properties: true
-
-    max_question_recursion: 1000
-    max_question_timeout: 60
-    max_search_depth: 100
-    max_search_timeout: 60
-
-    conversations:
-      type: file
-      config_name: file_storage
-      empty_on_start: true
-
-    file_storage:
-      dir: $BOT_ROOT/conversations
-
 brain:
 
     # Overrides
@@ -39,8 +24,8 @@ brain:
 
     # Nodes
     nodes:
-      pattern_nodes: $BOT_ROOT/config/pattern_nodes.conf
-      template_nodes: $BOT_ROOT/config/template_nodes.conf
+      pattern_nodes: ../../ybot/config/pattern_nodes.conf
+      template_nodes: ../../ybot/config/template_nodes.conf
 
     files:
         aiml:

bots/servusai/console/config/pattern_nodes.conf

@@ -12,19 +12,6 @@ bot:
 
     override_properties: true
 
-    max_question_recursion: 1000
-    max_question_timeout: 60
-    max_search_depth: 100
-    max_search_timeout: 60
-
-    conversations:
-      type: file
-      config_name: file_storage
-      empty_on_start: true
-
-    file_storage:
-      dir: $BOT_ROOT/conversations
-
 brain:
 
     # Overrides
@@ -41,8 +28,8 @@ brain:
 
     # Nodes
     nodes:
-      pattern_nodes: $BOT_ROOT/config/pattern_nodes.conf
-      template_nodes: $BOT_ROOT/config/template_nodes.conf
+      pattern_nodes: ../../ybot/config/pattern_nodes.conf
+      template_nodes: ../../ybot/config/template_nodes.conf
 
     files:
         aiml:
@@ -65,10 +52,7 @@ brain:
             port: 8989
             url: /api/v1.0/ask
 
-xmpp:
-  server: talk.google.com
-  port: 5222
-  xep_0030: true
-  xep_0004: true
-  xep_0060: true
-  xep_0199: true
+facebook:
+  host: 127.0.0.1
+  port: 5000
+  debug: false

bots/servusai/console/config/template_nodes.conf

@@ -1,9 +1,9 @@
 [Unit]
-Description=Y-Bot Demonstration Web Chat
+Description=Y-Bot Facebook Client
 
 [Service]
 User=ubuntu
-ExecStart=/opt/program-y/bots/y-bot/servusai-web.sh
+ExecStart=/opt/program-y/bots/servusai/servusai-facebook.sh
 Restart=always
 
 [Install]

bots/servusai/facebook/config.yaml

@@ -6,5 +6,5 @@ export PYTHONPATH=/opt/program-y/src:.
 
 cd /opt/program-y
 
-python3 /opt/program-y/src/programy/clients/webchat/chatsrv.py --config /opt/program-y/bots/y-bot/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
+python3 /opt/program-y/src/programy/clients/facebook.py --config /opt/program-y/bots/servusai/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
 

bots/servusai/facebook/config/pattern_nodes.conf

@@ -1,9 +1,9 @@
 [Unit]
-Description=Y-Bot Demonstration Web Chat
+Description=Y-Bot REST Client
 
 [Service]
 User=ubuntu
-ExecStart=/opt/program-y/bots/multibot/servusai-rest.sh
+ExecStart=/opt/program-y/bots/servusai/rest/servusai-rest.sh
 Restart=always
 
 [Install]

bots/servusai/facebook/config/template_nodes.conf

@@ -6,5 +6,5 @@ export PYTHONPATH=/opt/program-y/src:.
 
 cd /opt/program-y
 
-python3 /opt/program-y/src/programy/clients/flaskrest.py --config /opt/program-y/bots/multibot/rest/config.yaml --cformat yaml --logging /opt/program-y/bots/multibot/rest/logging.yaml
+python3 /opt/program-y/src/programy/clients/flaskrest.py --config /opt/program-y/bots/y-bot/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
 

bots/servusai/facebook/servusai-facebook.service

@@ -10,19 +10,6 @@ bot:
 
     override_properties: true
 
-    max_question_recursion: 1000
-    max_question_timeout: 60
-    max_search_depth: 100
-    max_search_timeout: 60
-
-    conversations:
-      type: file
-      config_name: file_storage
-      empty_on_start: true
-
-    file_storage:
-      dir: $BOT_ROOT/conversations
-
 brain:
 
     # Overrides
@@ -39,8 +26,8 @@ brain:
 
     # Nodes
     nodes:
-      pattern_nodes: $BOT_ROOT/config/pattern_nodes.conf
-      template_nodes: $BOT_ROOT/config/template_nodes.conf
+      pattern_nodes: ../../ybot/config/pattern_nodes.conf
+      template_nodes: ../../ybot/config/template_nodes.conf
 
     files:
         aiml:

bots/servusai/facebook/servusai-facebook.sh

@@ -1,9 +1,9 @@
 [Unit]
-Description=Y-Bot Demonstration Web Chat
+Description=Y-Bot TCP Socket Client
 
 [Service]
 User=ubuntu
-ExecStart=/opt/program-y/bots/multibot/socket/servusai-socket.sh
+ExecStart=/opt/program-y/bots/servusai/socket/servusai-socket.sh
 Restart=always
 
 [Install]

bots/servusai/rest/servusai-rest.service

@@ -6,5 +6,5 @@ export PYTHONPATH=/opt/program-y/src:.
 
 cd /opt/program-y
 
-python3 /opt/program-y/src/programy/clients/socket.py --config /opt/program-y/bots/y-bot/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml
+python3 /opt/program-y/src/programy/clients/socket.py --config /opt/program-y/bots/servusai/config.yaml --cformat yaml --logging /opt/program-y/bots/y-bot/logging.yaml