Skip to content

Commit fb05118

Browse files
keiffsterkeiffster
committed
Fixed merge conflict in README.md
2 parents ff6ff9f + ce53c43 commit fb05118

File tree

185 files changed

+13154
-7382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

185 files changed

+13154
-7382
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,5 @@ bots/y-bot/output/
104104
/bots/alice2/output/
105105
/bots/professor/output/
106106
/scratch/
107-
temp/
107+
temp/
108+
conversations/

‎README.md

Lines changed: 13 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,19 @@
11
# Readme info:
22

3-
Version: 1.0.1 <br/>
3+
Version: 1.2.0 <br/>
44
Authors: Keith Sterling <br/>
5-
Date: 13th October 2017 <br/>
6-
NEWS: Version 1.1.0 Released
7-
8-
# WHATS NEW IN 1.1
9-
10-
1) CSV Output.
11-
12-
By specifying the following config options, Program-Y can now output errors, duplicates and conversation in csv format
13-
14-
files:
15-
aiml:
16-
errors:
17-
file: /tmp/y-bot_errors.csv
18-
format: csv
19-
encoding: utf-8
20-
delete_on_start: true
21-
duplicates:
22-
file: /tmp/y-bot_duplicates.csv
23-
format: csv
24-
encoding: utf-8
25-
delete_on_start: true
26-
conversation:
27-
file: /tmp/y-bot-conversation.csv
28-
format: csv
29-
delete_on_start: true
30-
31-
2) Default Variables
32-
33-
New config option properties which will load a set of default property values into each new conversation as it is initiated.
34-
New conversations are defined by a unique clientid
35-
36-
files:
37-
aiml:
38-
properties: $BOT_ROOT/config/properties.txt
39-
5+
Date: 8th November 2017 <br/>
6+
7+
### Whats New in 1.2
8+
* RDF Engine completely rewritten to be fully compatible with Alice grammar
9+
* Refactored Y-Bot triples.txt into more understandable and workable files based on category
10+
* New RDF Formatter tool in utils
11+
* Updated use of file handling to open all but neccassary files in readonly mode
12+
* Conversations now persistent between bot restarts
13+
14+
### Whats New in 1.1
15+
* CSV Output.
16+
* Default Variables
4017

4118

4219
# Introduction

‎bots/alice2/aiml/admin/properties.aiml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<aiml>
3+
4+
<category>
5+
<pattern>YADMIN BOT PROPERTIES</pattern>
6+
<template>
7+
<extension path="programy.extensions.admin.properties.PropertiesAdminExtension">
8+
BOT
9+
</extension>
10+
</template>
11+
</category>
12+
13+
<category>
14+
<pattern>YADMIN GET BOT PROPERTY *</pattern>
15+
<template>
16+
<extension path="programy.extensions.admin.properties.PropertiesAdminExtension">
17+
GET BOT <star/>
18+
</extension>
19+
</template>
20+
</category>
21+
22+
<category>
23+
<pattern>YADMIN USER PROPERTIES</pattern>
24+
<template>
25+
<extension path="programy.extensions.admin.properties.PropertiesAdminExtension">
26+
USER
27+
</extension>
28+
</template>
29+
</category>
30+
31+
<category>
32+
<pattern>YADMIN GET USER PROPERTY *</pattern>
33+
<template>
34+
<extension path="programy.extensions.admin.properties.PropertiesAdminExtension">
35+
GET USER <star/>
36+
</extension>
37+
</template>
38+
</category>
39+
40+
</aiml>

‎bots/alice2/aiml/admin/rdf.aiml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<aiml>
3+
4+
<category>
5+
<pattern>RDF LIST SUBJECTS</pattern>
6+
<template>
7+
<extension path="programy.extensions.admin.rdf.RDFAdminExtension">
8+
SUBJECTS
9+
</extension>
10+
</template>
11+
</category>
12+
13+
<category>
14+
<pattern>RDF LIST PREDICATES SUBJECT *</pattern>
15+
<template>
16+
<extension path="programy.extensions.admin.rdf.RDFAdminExtension">
17+
PREDICATES <star/>
18+
</extension>
19+
</template>
20+
</category>
21+
22+
<category>
23+
<pattern>RDF LIST OBJECTS SUBJECT * PREDICATE *</pattern>
24+
<template>
25+
<extension path="programy.extensions.admin.rdf.RDFAdminExtension">
26+
OBJECT <star index="1" /> <star index="2" />
27+
</extension>
28+
</template>
29+
</category>
30+
31+
</aiml>

‎bots/alice2/aiml/admin/transcript.aiml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<aiml>
3+
4+
<category>
5+
<pattern>TRANSCRIPT</pattern>
6+
<template>
7+
<extension path="programy.extensions.admin.transcript.TranscriptAdminExtension">
8+
</extension>
9+
</template>
10+
</category>
11+
12+
<category>
13+
<pattern>TRANSCRIPT # PROPERTIES</pattern>
14+
<template>
15+
<extension path="programy.extensions.admin.transcript.TranscriptAdminExtension">
16+
PROPERTIES
17+
</extension>
18+
</template>
19+
</category>
20+
21+
</aiml>

‎bots/alice2/aiml/triple.aiml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@
1616
<!-- -->
1717
<!-- For more information see http://www.alicebot.org -->
1818
<!-- -->
19+
<category>
20+
<pattern>TRIPLE TEST * *</pattern>
21+
<template>
22+
<select>
23+
<vars>?x</vars>
24+
<q><subj><star index="1"/></subj><pred><star index="2"/></pred><obj>?x</obj></q>
25+
</select>
26+
</template>
27+
</category>
28+
1929
<category>
2030
<pattern>GENSYM</pattern>
2131
<template>
@@ -33,6 +43,7 @@
3343
</condition>
3444
</template>
3545
</category>
46+
3647
<category>
3748
<pattern>I HAVE A <set>color</set> *
3849
</pattern>
@@ -95,6 +106,7 @@
95106
is a nice color of<star index="2"/>.
96107
</template>
97108
</category>
109+
98110
<category>
99111
<pattern>WHAT DO I HAVE ^</pattern>
100112
<template>
@@ -150,6 +162,7 @@
150162
</condition>
151163
</template>
152164
</category>
165+
153166
<category>
154167
<pattern>WHAT COLOR IS MY *</pattern>
155168
<template>
@@ -195,6 +208,7 @@
195208
</condition>
196209
</template>
197210
</category>
211+
198212
<category>
199213
<pattern>WHAT <set>color</set> ^ DO I HAVE
200214
</pattern>
@@ -240,6 +254,7 @@
240254
</condition>
241255
</template>
242256
</category>
257+
243258
<category>
244259
<pattern>
245260
<set>entity</set>
@@ -249,6 +264,7 @@
249264
is an enity.
250265
</template>
251266
</category>
267+
252268
<category>
253269
<pattern>SIZE TABLE</pattern>
254270
<template>
@@ -311,16 +327,19 @@
311327
</condition>
312328
</template>
313329
</category>
330+
314331
<category>
315332
<pattern>COMMAFY NIL</pattern>
316333
<template>
317334
<template/>
318335
</template>
319336
</category>
337+
320338
<category>
321339
<pattern>COMMAFY *</pattern>
322340
<template>,</template>
323341
</category>
342+
324343
<category>
325344
<pattern>UNIQ TEST</pattern>
326345
<template>
@@ -331,6 +350,7 @@
331350
</uniq>
332351
</template>
333352
</category>
353+
334354
<category>
335355
<pattern>UNIQ TEST 2</pattern>
336356
<template>
@@ -365,6 +385,7 @@
365385
</uniq>
366386
</template>
367387
</category>
388+
368389
<category>
369390
<pattern>UNIQ TEST 3</pattern>
370391
<template>
@@ -383,6 +404,7 @@
383404
</uniq>
384405
</template>
385406
</category>
407+
386408
<category>
387409
<pattern>WHAT IS THE PURPOSE OF *</pattern>
388410
<template>
@@ -408,6 +430,7 @@
408430
</condition>
409431
</template>
410432
</category>
433+
411434
<category>
412435
<pattern>ADDTRIPLE TEST</pattern>
413436
<template>Adding triples:
@@ -437,6 +460,7 @@
437460
</addtriple>
438461
</template>
439462
</category>
463+
440464
<category>
441465
<pattern>DELETETRIPLE TEST</pattern>
442466
<template>Adding triples:
@@ -495,6 +519,7 @@
495519
</select>
496520
</template>
497521
</category>
522+
498523
<category>
499524
<pattern>WHICH IS LARGER ^ <set>entity</set> OR ^
500525
<set>entity</set>
@@ -521,6 +546,7 @@
521546
</condition>
522547
</template>
523548
</category>
549+
524550
<category>
525551
<pattern>WHICH IS FASTER <set>entity</set> OR
526552
<set>entity</set>
@@ -547,6 +573,7 @@
547573
</condition>
548574
</template>
549575
</category>
576+
550577
<category>
551578
<pattern>ALL ISA</pattern>
552579
<template>
@@ -613,6 +640,7 @@
613640
</condition>
614641
</template>
615642
</category>
643+
616644
<category>
617645
<pattern>SELECT TEST</pattern>
618646
<template>
@@ -656,6 +684,7 @@
656684
</condition>
657685
</template>
658686
</category>
687+
659688
<category>
660689
<pattern>SELECT TEST NOTQ</pattern>
661690
<template>
@@ -671,6 +700,7 @@
671700
</set>
672701
</template>
673702
</category>
703+
674704
<category>
675705
<pattern>SELECT TEST NOT</pattern>
676706
<template>
@@ -714,6 +744,7 @@
714744
</condition>
715745
</template>
716746
</category>
747+
717748
<category>
718749
<pattern>SELECT TEST NOT 2</pattern>
719750
<template>
@@ -767,6 +798,7 @@
767798
</condition>
768799
</template>
769800
</category>
801+
770802
<category>
771803
<pattern>SELECT TEST NOT 3</pattern>
772804
<template>
@@ -820,6 +852,7 @@
820852
</condition>
821853
</template>
822854
</category>
855+
823856
<category>
824857
<pattern>SELECT TEST 3</pattern>
825858
<template>
@@ -884,6 +917,7 @@
884917
</condition>
885918
</template>
886919
</category>
920+
887921
<category>
888922
<pattern>SELECT TEST 2</pattern>
889923
<template>
@@ -932,6 +966,7 @@
932966
</condition>
933967
</template>
934968
</category>
969+
935970
<category>
936971
<pattern>* IS <set>erdown</set> THAN *
937972
</pattern>
@@ -962,6 +997,7 @@
962997
</srai>
963998
</template>
964999
</category>
1000+
9651001
<category>
9661002
<pattern>
9671003
<set>name</set>

0 commit comments

Comments
 (0)