Merge lp:~stefanor/ibid/dict-398764 into lp:~ibid-core/ibid/old-trunk-pack-0.92

[Stefano Rivera]

[Stefano Rivera (stefanor)]

Don't know what you think of the encoding situation here. The dict protocol is UTF-8 capable, but the strategies don't do a good job with it, and none of the dictionaries currently include non-7-bit characters.

The Python dictclient library just deals in strings.

Query: spell naïve
Response: That doesn't seem correct, but I can't find anything to suggest

One thought is to make the bot say "My dictionaries can't understand non-latin characters, try asking again, in plain text" or just silently strip them and hope that "lev" will do the trick. Although in that case, the "you've spelt that correctly" would refer to the stripped version, and thus be wrong.

[Michael Gorven (mgorven)]

 review approve

review: Approve

[Jonathan Hitchcock (vhata)]

This bot is getting sarcier every merge.

review: Approve

[Jonathan Hitchcock (vhata)]

> The Python dictclient library just deals in strings.

Biggest win - fix the dictclient library. Anything else is a workaround.

> One thought is to make the bot say "My dictionaries can't understand non-latin
> characters, try asking again, in plain text" or just silently strip them and
> hope that "lev" will do the trick. Although in that case, the "you've spelt
> that correctly" would refer to the stripped version, and thus be wrong.

You could strip the non-latin characters, and return "I know about this latin word, but not sure about your funky variant"? Otherwise I think simply stripping is the biggest win (but it should definitely report which word is correct, rather than the current situation where it just says "yebo") - saying 'this latin word is right' is better than incorrectly saying that a funky non-latin word is wrong.

review: Needs Fixing

[lp:~stefanor/ibid/dict-398764]

718. By Stefano Rivera on 2009-07-15

Don't try and put the utf-8 encoded word in the unicode response

[Stefano Rivera (stefanor)]

Seems it did work. Made a minor fix to get define to work when given a non-ASCII word.

18:45 < tumbleweed> tibid: define naïve
18:45 < tibid> tumbleweed: I don't know about naïve. Maybe you meant naive?
18:45 < tumbleweed> tibid: spell naïve
18:45 < tibid> tumbleweed: Suggestions: naive

[Jonathan Hitchcock (vhata)]

review: Approve

=== modified file 'ibid/plugins/dict.py'
--- ibid/plugins/dict.py	2009-07-10 14:07:41 +0000
+++ ibid/plugins/dict.py	2009-07-14 23:26:37 +0000
@@ -1,7 +1,10 @@
+from random import choice
+
 from dictclient import Connection
 
 from ibid.plugins import Processor, match
 from ibid.config import Option, IntOption
+from ibid.utils import human_join
 
 help = {'dict': u'Defines words and checks spellings.'}
 
@@ -18,30 +21,54 @@
     @match(r'^define\s+(.+?)(?:\s+using\s+(.+))?$')
     def define(self, event, word, dictionary):
         connection = Connection(self.server, self.port)
-        try:
-            definitions = connection.define(dictionary or '*', word)
-        except Exception, e:
-            event.addresponse(u'The dictionary complained: %s' % unicode(e))
+        dictionary = dictionary is None and '*' or dictionary.lower()
+        word = word.encode('utf-8')
+        dictionaries = connection.getdbdescs().keys()
+
+        if dictionary != '*' and dictionary not in dictionaries:
+            event.addresponse(
+                    u"I'm afraid I don't have a dictionary of that name. I know about: %s",
+                    human_join(sorted(dictionaries)))
             return
 
+        definitions = connection.define(dictionary, word)
         if definitions:
-            event.addresponse(u', '.join([d.getdefstr() for d in definitions]))
+            event.addresponse(u', '.join(d.getdefstr() for d in definitions))
         else:
-            event.addresponse(u"I don't have a definition for that. Is it even a word?")
+            suggestions = connection.match(dictionary, 'lev', word)
+            if suggestions:
+                event.addresponse(
+                        u"I don't know about %(word)s. Maybe you meant %(suggestions)s?", {
+                            'word': word,
+                            'suggestions': human_join([d.getword() for d in suggestions], conjunction=u'or'),
+                })
+            else:
+                event.addresponse(u"I don't have a definition for that. Is it even a word?")
 
     @match(r'^spell\s+(.+?)(?:\s+using\s+(.+))?$')
     def handle_spell(self, event, word, strategy):
         connection = Connection(self.server, self.port)
-        try:
-            correct = connection.match('*', 'exact', word)
-            if correct:
-                event.addresponse(u'That seems correct. Carry on')
-                return
-            suggestions = connection.match('*', strategy or 'lev', word)
-        except Exception, e:
-            event.addresponse(u'The dictionary complained: %s' % unicode(e))
+        word = word.encode('utf-8')
+        strategies = connection.getstratdescs().keys()
+
+        if connection.match('*', 'exact', word):
+            event.addresponse(choice((
+                u'That seems correct. Carry on',
+                u'Looks good to me',
+                u"Yup, that's a word all right",
+                u'Yes, you *can* spell',
+            )))
+            return
+
+        strategy = strategy is None and 'lev' or strategy.lower()
+        if strategy not in strategies:
+            event.addresponse(
+                    u"I'm afraid I don't know about such a strategy. I know about: %s",
+                    human_join(sorted(strategies)))
+
+        suggestions = connection.match('*', strategy, word)
         if suggestions:
-            event.addresponse(u'Suggestions: %s', u', '.join([d.getword() for d in suggestions]))
+            event.addresponse(u'Suggestions: %s', human_join([d.getword() for d in suggestions]))
         else:
             event.addresponse(u"That doesn't seem correct, but I can't find anything to suggest")
 
@@ -49,20 +76,21 @@
     def handle_dictionaries(self, event):
         connection = Connection(self.server, self.port)
         dictionaries = connection.getdbdescs()
-        event.addresponse(u'Dictionaries: %s', u', '.join(sorted(dictionaries.keys())) or u'none')
+        event.addresponse(u'My Dictionaries: %s', human_join(sorted(dictionaries.keys())))
 
     @match(r'^strater?gies$')
     def handle_strategies(self, event):
         connection = Connection(self.server, self.port)
         strategies = connection.getstratdescs()
-        event.addresponse(u'Strategies: %s', u', '.join(sorted(strategies.keys())))
+        event.addresponse(u'My Strategies: %s', human_join(sorted(strategies.keys())))
 
     @match(r'^dictionary\s+(.+?)$')
     def handle_dictionary(self, event, dictionary):
         connection = Connection(self.server, self.port)
         dictionaries = connection.getdbdescs()
+        dictionary = dictionary.lower()
         if dictionary in dictionaries:
-            event.addresponse(dictionaries[dictionary])
+            event.addresponse(unicode(dictionaries[dictionary]))
         else:
             event.addresponse(u"I don't have that dictionary")
 
@@ -70,8 +98,9 @@
     def handle_strategy(self, event, strategy):
         connection = Connection(self.server, self.port)
         strategies = connection.getstratdescs()
+        strategy = strategy.lower()
         if strategy in strategies:
-            event.addresponse(strategies[strategy])
+            event.addresponse(unicode(strategies[strategy]))
         else:
             event.addresponse(u"I don't have that strategy")
 

=== modified file 'ibid/utils.py'
--- ibid/utils.py	2009-07-12 15:26:14 +0000
+++ ibid/utils.py	2009-07-14 23:26:37 +0000
@@ -221,5 +221,10 @@
         return json.loads(data)
     except ValueError, e:
         raise JSONException(e)
-    
+
+def human_join(list, conjunction=u'and'):
+    "Create a list like: a, b, c and d"
+    return ((u' %s ' % conjunction)
+            .join(filter(None, [u', '.join(list[:-1])] + list[-1:])))
+
 # vi: set et sta sw=4 ts=4: