Definition of forms as classes; Validation of input form data; New option of

recommendation by packages_list; Templates layout modifications.

Definition of forms as classes; Validation of input form data; New option of
recommendation by packages_list; Templates layout modifications.
Tássia Camões Araújo
1 parent 4ea9806a
Showing 11 changed files with 212 additions and 170 deletions Show diff stats
src/recommender.py
src/strategy.py
src/user.py
src/web/server.py
src/web/templates/apprec.html
src/web/templates/error.html
src/web/templates/feedbackForm.html
src/web/templates/feedbackThanks.html
src/web/templates/index.html
src/web/templates/layout.html
src/web/templates/thanks.html
@@ -49,7 +49,7 @@ class RecommendationResult:
         Return prediction based on recommendation size (number of items).
         """
         sorted_result = sorted(self.item_score.items(), key=itemgetter(1))
-        return reversed(sorted_result[:size])
+        return reversed(sorted_result[-size:])
 class Recommender:
     """
@@ -20,6 +20,7 @@ __license__ = &quot;&quot;&quot;
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
+import string
 import os, re
 import xapian
 from data import *
@@ -181,7 +182,8 @@ class AxiContentBasedStrategy(RecommendationStrategy):
         Perform recommendation strategy.
         """
         profile = user.axi_tag_profile(rec.items_repository,50)
-        query = xapian.Query(xapian.Query.OP_OR,profile)
+        #profile_str = string.join(list(profile),' ')
+        query = xapian.Query(xapian.Query.OP_OR,list(profile))
         enquire = xapian.Enquire(rec.items_repository)
         enquire.set_query(query)
@@ -200,13 +202,17 @@ class CollaborativeStrategy(RecommendationStrategy):
     """
     Colaborative recommendation strategy.
     """
+    def __init__(self):
+        self.description = "Collaborative"
+
     #def run(self,rec,user,similarity_measure):
     def run(self,rec,user):
         """
         Perform recommendation strategy.
         """
         profile = user.maximal_pkg_profile()
-        query = xapian.Query(xapian.Query.OP_OR,profile)
+        #profile_str = string.join(list(profile),' ')
+        query = xapian.Query(xapian.Query.OP_OR,list(profile))
         enquire = xapian.Enquire(rec.users_repository)
         enquire.set_query(query)
@@ -236,6 +242,9 @@ class KnowledgeBasedStrategy(RecommendationStrategy):
     """
     Knowledge-based recommendation strategy.
     """
+    def __init__(self):
+        self.description = "Knowledge-based"
+
     def run(self,user,knowledge_repository):
         """
         Perform recommendation strategy.
@@ -247,6 +256,9 @@ class DemographicStrategy(RecommendationStrategy):
     """
     Recommendation strategy based on demographic data.
     """
+    def __init__(self):
+        self.description = "Demographic"
+
     def run(self,user,items_repository):
         """
         Perform recommendation strategy.
@@ -123,12 +123,17 @@ class User:
         cache = apt.Cache()
         old_profile_size = len(self.pkg_profile)
         for p in self.pkg_profile[:]:     #iterate list copy
-            pkg = cache[p]
-            if pkg.candidate:
-                for dep in pkg.candidate.dependencies:
-                    for or_dep in dep.or_dependencies:
-                        if or_dep.name in self.pkg_profile:
-                            self.pkg_profile.remove(or_dep.name)
+            try:
+                if cache.has_key(p):
+                    pkg = cache[p]
+                    if pkg.candidate:
+                        for dep in pkg.candidate.dependencies:
+                            for or_dep in dep.or_dependencies:
+                                if or_dep.name in self.pkg_profile:
+                                    self.pkg_profile.remove(or_dep.name)
+            except:
+                logging.debug("Disconsidering package not found in cache: %s"
+                              % p)
         profile_size = len(self.pkg_profile)
         logging.info("Reduced packages profile size from %d to %d." %
                      (old_profile_size, profile_size))
@@ -157,9 +162,14 @@ class LocalSystem(User):
         cache = apt.Cache()
         old_profile_size = len(self.pkg_profile)
         for p in self.pkg_profile[:]:     #iterate list copy
-            pkg = cache[p]
-            if pkg.is_auto_installed:
-                self.pkg_profile.remove(p)
+            try:
+                if cache.has_key(p):
+                    pkg = cache[p]
+                    if pkg.is_auto_installed:
+                        self.pkg_profile.remove(p)
+            except:
+                logging.debug("Disconsidering package not found in cache: %s"
+                              % p)
         profile_size = len(self.pkg_profile)
         logging.info("Reduced packages profile size from %d to %d." %
                      (old_profile_size, profile_size))
@@ -11,119 +11,117 @@ from config import *
 from recommender import *
 from user import *
-def add_global_hook():
-    g = web.storage({"counter": "1"})
-    def _wrapper(handler):
-        web.ctx.globals = g
-        return handler()
-    return _wrapper
-
-class Index:
-    def GET(self):
-        form_action = "/feedback"
-        form_method = "post"
-        form = self._form()
-        return render.index(form_action, form_method, form)
-
-    def _form(self):
-        send_form = form.Form(
-            form.File("pkgs_file", description="Packages list"),
-            form.Dropdown('limit', [('5', '05'), ('10', '10'), ('20', '20')],
+class RequestForm(form.Form):
+    def __init__(self):
+        form.Form.__init__(self, \
+            form.File("pkgs_file", description="Upload file"),
+            form.Textarea("pkgs_list", description="Packages",
+                          rows="4", cols="40"),
+            form.Dropdown('limit', [(5, '05'), (10, '10'), (20, '20')],
                           description = "Limit"),
-            form.Checkbox("strategy_cb", value="True", checked=False,
+            form.Checkbox("strategy_cb", value=1, checked=False,
                           description="Content-based"),
-            form.Checkbox("strategy_col", value="True", checked=False,
+            form.Checkbox("strategy_col", value=1, checked=False,
                           description="Collaborative"),
             form.Checkbox("strategy_hybrid", value="True", checked=False,
                           description="Hybrid"),
             form.Checkbox("strategy_hybrid_plus", value="True", checked=False,
                           description="Hybrid plus"),
-            validators = [form.Validator("You must select at least one strategy",
-                          lambda i: i.strategy_cb | i.startegy_col |
-                                    i.strategy_hybrid | i.strategy_hybrid_plus)]
-        )
-        return send_form()
+            validators = [form.Validator("No packages list provided.",
+                                  lambda f: f.has_key("pkgs_list") |
+                                            f.has_key("pkgs_file") ),
+                          form.Validator("No strategy selected.",
+                                  lambda f: f.has_key("strategy_cb") |
+                                            f.has_key("startegy_col") |
+                                            f.has_key("strategy_hybrid") |
+                                            f.has_key("strategy_hybrid_plus")) ])
+
+class FeedbackForm(form.Form):
+    def __init__(self,strategies):
+        desc_dict = {"cta": "Content-based", "col": "Collaborative",
+                     "hybrid": "Hybrib", "hybrid_plus": "Hybrid Plus"}
+        fields = []
+        for strategy in strategies:
+            fields.append(form.Radio(desc_dict[strategy],
+                [('1','1 '),('2','2 '),('3','3'),('4','4 '),('5','5')]))
+        form.Form.__init__(self, *fields, validators = [])
+
+class Index:
+    def GET(self):
+        return render.index("/apprec", "post", RequestForm())
+
+class Thanks:
+    def POST(self):
+        return render.thanks()
-class FeedbackForm:
+class AppRecommender:
     def POST(self):
-        action = "/thanks"
-        method = "post"
         outputdir = tempfile.mkdtemp(prefix='',dir='./submissions/')
         user_id = outputdir.lstrip('./submissions/')
-        x = web.input(pkgs_file={})
-        f = open(outputdir + "/packages_list", "wb")
-        #content = x['pkgs_file'].value
-        self.pkgs_list = []
-        for line in x['pkgs_file'].file:
-            self.pkgs_list.append(line.split()[0])
-            f.write(line)
-       # while 1:
-       #     chunk = x['pkgs_file'].file.read(10000)
-       #     if not chunk:
-       #         break
-       #     f.write(chunk)
-        f.close()
-
-        strategies = []
-        if 'strategy_cb' in x: strategies.append("cta")
-        if 'strategy_col' in x: strategies.append("col")
-        if 'strategy_hybrid' in x: strategies.append("hybrid")
-        if 'strategy_hybrid+' in x: strategies.append("hybrid+")
-
-        return render.feedbackForm(action, method,
-                                   self._recommends(user_id,strategies),
-                                   self._form())
-
-    def _recommends(self,user_id,strategies):
-        user = User(dict.fromkeys(self.pkgs_list,1),user_id)
+        request = RequestForm()
+        request_info = web.input(pkgs_file={})
+        if not request.validates(request_info):
+            return render.error(request)
+        else:
+            user_pkgs_list = []
+            if request_info.has_key('pkgs_list'):
+                user_pkgs_list = request_info['pkgs_list'].encode('utf8').split()
+                print user_pkgs_list
+
+            if request_info.has_key('pkgs_file'):
+                f = open(outputdir + "/packages_list", "wb")
+                for line in request_info['pkgs_file'].file:
+                    user_pkgs_list.append(line.split()[0])
+                    f.write(line)
+                f.close()
+
+            strategies = []
+            if request_info.has_key('strategy_cb'): strategies.append("cta")
+            ### Colaborative strategies can not go online yet
+            if request_info.has_key('strategy_col'): strategies.append("col")
+            if request_info.has_key('strategy_hybrid'):
+                strategies.append("hybrid")
+            if request_info.has_key('strategy_hybrid_plus'):
+                strategies.append("hybrid_plus")
+
+            return render.apprec("/thanks", "post",
+                                 self._recommends(user_id,user_pkgs_list,
+                                 strategies, int(request_info['limit'])),
+                                 FeedbackForm(strategies))
+
+    def _recommends(self,user_id,user_pkgs_list,strategies,limit):
+        user = User(dict.fromkeys(user_pkgs_list,1),user_id)
         user.maximal_pkg_profile()
         cfg = Config()
         rec = Recommender(cfg)
         results = dict()
         for strategy in strategies:
-            eval("rec."+strategy+"(cfg)")
-            prediction = rec.get_recommendation(user).get_prediction()
-            results[rec.strategy.description] = [result[0] for result in prediction]
-        # Colaborative strategies can not go online yet
-        results['Hybrid+'] = []
-        results['Hybrid'] = []
-        results['Collaborative'] = []
+            ### Colaborative strategies can not go online yet
+            #eval("rec."+strategy+"(cfg)")
+            rec.cta(cfg)
+            prediction = rec.get_recommendation(user).get_prediction(limit)
+            results[rec.strategy.description] = \
+                [result[0] for result in prediction]
         return results
-    def _form(self):
-        send_form = form.Form(
-            form.Radio('Content-based',
-                       [('1','1 '),('2','2 '),('3','3 '),('4','4 '),('5','5')]),
-            form.Radio('Collaborative',
-                       [('1','1 '),('2','2 '),('3','3 '),('4','4 '),('5','5')]),
-            form.Radio('Hybrid',
-                       [('1','1 '),('2','2 '),('3','3 '),('4','4 '),('5','5')]),
-            form.Radio('Hybrid+',
-                       [('1','1 '),('2','2 '),('3','3 '),('4','4 '),('5','5')]),
-            form.Dropdown('expertise',
-                          ["Newbie", "Intermediate", "Advanced", "Guru", "Chuck Norris"],
-                          description ='Debian expertise'),
-            form.Textarea('comments', rows="7", cols="60",
-                          description="Anything else to share?"),
-
-        )
-        return send_form
-
-class FeedbackThanks:
-    def POST(self):
-        return render.feedbackThanks()
+def add_global_hook():
+    g = web.storage({"counter": "1"})
+    def _wrapper(handler):
+        web.ctx.globals = g
+        return handler()
+    return _wrapper
 render = web.template.render('templates/', base='layout')
 urls = ('/',    		'Index',
-        '/feedback',	'FeedbackForm',
-        '/thanks',  	'FeedbackThanks'
+        '/apprec',  	'AppRecommender',
+        '/thanks',  	'Thanks'
        )
 web.webapi.internalerror = web.debugerror
 if __name__ == "__main__":
-   app = web.application(urls, globals())
-   app.add_processor(add_global_hook())
-   app.run()
+   apprec = web.application(urls, globals())
+   apprec.add_processor(add_global_hook())
+   apprec.run()
@@ -0,0 +1,48 @@
+$def with (action, method, recommends, form)
+$var title: Feedback
+$var mod = 'feedback';
+
+        <div class="index_include">
+
+
+<center>
+                <h1>Recommendations</h1>
+</center>
+
+<p>Results per strategy:</p>
+
+<ul class="toc">
+$for strategy, result in recommends.items():
+    <li><a href="#$strategy">$strategy</a></li>
+<li><a href="#feedback">Your feedback is appreciated!</a></li>
+</ul>
+
+<form action="$action" method="$method">
+$for strategy, result in recommends.items():
+    <h2><a name="$strategy" id="$strategy">$strategy</a></h2>
+    $for pkg in result:
+        <div class="line">
+        <div class="item col50">
+        <image src="http://screenshots.debian.net/screenshot/$pkg" width="300">
+        </div>
+        <div class="item col50 lastcol">
+	<script>loadPackage("$pkg");</script>
+	<b id="pack-$pkg"></b><div id="desc-$pkg"> </div>
+	<ul>
+	<li id="maint-$pkg"></li>
+	<li id="homepage-$pkg"></li>
+	</ul>
+        </div>
+        <div class="clear"></div>
+        </div>
+    <hr />
+
+<h2><a name="feedback" id="feedback">Feedback</a></h2>
+
+$:form.render()
+<input type="submit" />
+</form>
+
+
+</div>
+
@@ -0,0 +1,23 @@
+$def with (form)
+$var title: Error
+$var mod = 'error';
+
+<div class="index_include">
+<center>
+    <h1>Welcome to AppRecommender</h1>
+</center>
+
+<div class="align-right"><img alt="AppRecommender logo" src="/static/Pics/AppRecommender-logo.jpg" /></div>
+
+Your request could not be proccessed due to the following error(s): 
+
+<ul>
+$for v in form.validators:
+    <b><li>$v.msg</li></b>
+</ul>
+
+<p><a href="/">Go back</a> and try again. </p>
+<p>If you believe it is a bug, please report to <a
+href="mailto:tassia@gamil.com">tassia@gmail.com</a>.</p>
+
+</div>
@@ -1,50 +0,0 @@
-$def with (action, method, recommends, form)
-$var title: Feedback
-$var mod = 'feedback';
-
-        <div class="index_include">
-
-
-<center>
-                <h1>Recommendations</h1>
-</center>
-
-<p>Results per strategy:</p>
-
-<ul class="toc">
-$for strategy, result in recommends.items():
-    <li><a href="#$strategy">$strategy</a></li>
-<li><a href="#feedback">Your feedback is appreciated!</a></li>
-</ul>
-
-<form action="$action" method="$method">
-$for strategy, result in recommends.items():
-    <h2><a name="$strategy" id="$strategy">$strategy</a></h2>
-    $for pkg in result:
-        <div class="line">
-        <div class="item col50">
-        <image src="http://screenshots.debian.net/screenshot/$pkg" width="300">
-        </div>
-        <div class="item col50 lastcol">
-	<script>loadPackage("$pkg");</script>
-	<b id="pack-$pkg"></b><div id="desc-$pkg"> </div>
-	<ul>
-	<li id="maint-$pkg"></li>
-	<li id="homepage-$pkg"></li>
-	</ul>
-        </div>
-        <div class="clear"></div>
-        </div>
-    <hr />
-
-<h2><a name="feedback" id="feedback">Feedback</a></h2>
-
-$if not form.valid: <p>Try again, AmeriCAN:</p>
-$:form.render()
-<br />
-<input type="submit" />
-</form>
-
-
-</div>
-
@@ -1,9 +0,0 @@
-$var title: Feedback
-$var mod = 'thanks';
-
-        <div class="index_include">
-<center>
-                <h1>Thanks!</h1>
-</center>
-
-</div>
@@ -16,9 +16,7 @@ providing platform independent solutions, it should also follow this
 principle.</p>
 <form action="$action" enctype="multipart/form-data" method="$method">
-$if not form.valid: <p>Try again, AmeriCAN:</p>
 $:form.render()
-<p>&nbsp;</p>
 <input type="submit" />
 </form>
@@ -40,7 +40,7 @@ function loadPackage(packagename)
                 <div id="logo">
                         <a href="http://www.debian.org/" title="Debian Home"><img src="/static/Pics/openlogo-50.png" alt="Debian" width="50" height="61" /></a>
                 </div>
-                <p class="section">Recommender</p>
+                <p class="section">APP_REC</p>
         </div>
@@ -48,10 +48,13 @@ function loadPackage(packagename)
                 <p class="hidecss"><a href="#inner">Skip Quicknav</a></p>
                 <ul>
-                   <li><a href="http://www.debian.org/intro/about">About Debian</a></li>
-                   <li><a href="http://www.debian.org/distrib/">Getting Debian</a></li>
-                   <li><a href="http://www.debian.org/support">Support</a></li>
-                   <li><a href="http://www.debian.org/devel/">Developers'&nbsp;Corner</a></li>
+                   <li><a href="/">Home</a></li>
+                   <li>
+                   <a href="http://www.ime.usp.br/~tassia/apprec.html">About</a>
+                   </li>
+                   <li>
+                   <a href="http://github.com/tassia/AppRecommender">Devel</a>
+                   </li>
                 </ul>
         </div>
@@ -69,11 +72,9 @@ $:content
 	<div id="footer">
 		<div id="pageinfo">
-<p>Back to the <a href="http://www.debian.org/../">Debian Project homepage</a>.</p>
-<hr/>
 <div id="footermap">
 <!--UdmComment-->
-<p><strong><a href="http://www.debian.org">Home</a></strong></p>
+<p><strong><a href="http://www.debian.org">Debian Project homepage</a></strong></p>
     <ul id="footermap-cola">
 		<li><a href="http://www.debian.org/intro/about">About</a>
 		  <ul>
@@ -141,11 +142,13 @@ $:content
 </ul>
 <!--/UdmComment-->
 </div> <!-- end footermap -->
+
+<hr />
 <div id="fineprint">
   <p>To report a problem with the web site, e-mail <a
   href="mailto:tassia@gmail.com">tassia@gmail.com</a>.</p>
 <p>
-Last Modified: <span class="date">Mon 09 May 2011 04:08:40 AM UTC</span>
+Last Modified: <span class="date">Mon 24 June 2011 21:00:40 UTC</span>
   <br />
   Copyright &copy; 2011
  <a href="$url_base">AppRecommender</a>.<br />
@@ -0,0 +1,9 @@
+$var title: Feedback
+$var mod = 'thanks';
+
+        <div class="index_include">
+<center>
+                <h1>Thanks!</h1>
+</center>
+
+</div>
	@@ -49,7 +49,7 @@ class RecommendationResult:		@@ -49,7 +49,7 @@ class RecommendationResult:
49	Return prediction based on recommendation size (number of items).	49	Return prediction based on recommendation size (number of items).
50	"""	50	"""
51	sorted_result = sorted(self.item_score.items(), key=itemgetter(1))	51	sorted_result = sorted(self.item_score.items(), key=itemgetter(1))
52	- return reversed(sorted_result[:size])	52	+ return reversed(sorted_result[-size:])
53		53
54	class Recommender:	54	class Recommender:
55	"""	55	"""
@@ -0,0 +1,48 @@		@@ -0,0 +1,48 @@
	1	+$def with (action, method, recommends, form)
	2	+$var title: Feedback
	3	+$var mod = 'feedback';
	4	+
	5	+ <div class="index_include">
	6	+
	7	+
	8	+<center>
	9	+ <h1>Recommendations</h1>
	10	+</center>
	11	+
	12	+<p>Results per strategy:</p>
	13	+
	14	+<ul class="toc">
	15	+$for strategy, result in recommends.items():
	16	+ <li><a href="#$strategy">$strategy</a></li>
	17	+<li><a href="#feedback">Your feedback is appreciated!</a></li>
	18	+</ul>
	19	+
	20	+<form action="$action" method="$method">
	21	+$for strategy, result in recommends.items():
	22	+ <h2><a name="$strategy" id="$strategy">$strategy</a></h2>
	23	+ $for pkg in result:
	24	+ <div class="line">
	25	+ <div class="item col50">
	26	+ <image src="http://screenshots.debian.net/screenshot/$pkg" width="300">
	27	+ </div>
	28	+ <div class="item col50 lastcol">
	29	+ <script>loadPackage("$pkg");</script>
	30	+ <b id="pack-$pkg"></b><div id="desc-$pkg"> </div>
	31	+ <ul>
	32	+ <li id="maint-$pkg"></li>
	33	+ <li id="homepage-$pkg"></li>
	34	+ </ul>
	35	+ </div>
	36	+ <div class="clear"></div>
	37	+ </div>
	38	+ <hr />
	39	+
	40	+<h2><a name="feedback" id="feedback">Feedback</a></h2>
	41	+
	42	+$:form.render()
	43	+<input type="submit" />
	44	+</form>
	45	+
	46	+
	47	+</div>
	48	+
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+$def with (form)
	2	+$var title: Error
	3	+$var mod = 'error';
	4	+
	5	+<div class="index_include">
	6	+<center>
	7	+ <h1>Welcome to AppRecommender</h1>
	8	+</center>
	9	+
	10	+<div class="align-right"><img alt="AppRecommender logo" src="/static/Pics/AppRecommender-logo.jpg" /></div>
	11	+
	12	+Your request could not be proccessed due to the following error(s):
	13	+
	14	+<ul>
	15	+$for v in form.validators:
	16	+ <b><li>$v.msg</li></b>
	17	+</ul>
	18	+
	19	+<p><a href="/">Go back</a> and try again. </p>
	20	+<p>If you believe it is a bug, please report to <a
	21	+href="mailto:tassia@gamil.com">tassia@gmail.com</a>.</p>
	22	+
	23	+</div>
	@@ -1,50 +0,0 @@	@@ -1,50 +0,0 @@
1	-$def with (action, method, recommends, form)
2	-$var title: Feedback
3	-$var mod = 'feedback';
4	-
5	- <div class="index_include">
6	-
7	-
8	-<center>
9	- <h1>Recommendations</h1>
10	-</center>
11	-
12	-<p>Results per strategy:</p>
13	-
14	-<ul class="toc">
15	-$for strategy, result in recommends.items():
16	- <li><a href="#$strategy">$strategy</a></li>
17	-<li><a href="#feedback">Your feedback is appreciated!</a></li>
18	-</ul>
19	-
20	-<form action="$action" method="$method">
21	-$for strategy, result in recommends.items():
22	- <h2><a name="$strategy" id="$strategy">$strategy</a></h2>
23	- $for pkg in result:
24	- <div class="line">
25	- <div class="item col50">
26	- <image src="http://screenshots.debian.net/screenshot/$pkg" width="300">
27	- </div>
28	- <div class="item col50 lastcol">
29	- <script>loadPackage("$pkg");</script>
30	- <b id="pack-$pkg"></b><div id="desc-$pkg"> </div>
31	- <ul>
32	- <li id="maint-$pkg"></li>
33	- <li id="homepage-$pkg"></li>
34	- </ul>
35	- </div>
36	- <div class="clear"></div>
37	- </div>
38	- <hr />
39	-
40	-<h2><a name="feedback" id="feedback">Feedback</a></h2>
41	-
42	-$if not form.valid: <p>Try again, AmeriCAN:</p>
43	-$:form.render()
44	-<br />
45	-<input type="submit" />
46	-</form>
47	-
48	-
49	-</div>
50	-
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-$var title: Feedback
2	-$var mod = 'thanks';
3	-
4	- <div class="index_include">
5	-<center>
6	- <h1>Thanks!</h1>
7	-</center>
8	-
9	-</div>
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+$var title: Feedback
	2	+$var mod = 'thanks';
	3	+
	4	+ <div class="index_include">
	5	+<center>
	6	+ <h1>Thanks!</h1>
	7	+</center>
	8	+
	9	+</div>