Integrated recommender and new web form; changed section about; changes frontpage layout;

Tássia Camões Araújo
1 parent a7a750fa
Showing 6 changed files with 184 additions and 124 deletions Show diff stats
src/web/server.py
src/web/templates/about.html
src/web/templates/apprec.html
src/web/templates/error.html
src/web/templates/index.html
src/web/templates/layout.html
@@ -6,6 +6,7 @@ import tempfile
 import sys
 import simplejson as json
 import apt
+import re
 sys.path.insert(0,"../")
@@ -15,44 +16,24 @@ from user import *
 import urllib
-class RequestForm(form.Form):
-    def __init__(self):
-        form.Form.__init__(self, \
-            form.File("pkgs_file", size=35, description="Upload file"),
-            form.Textarea("pkgs_list", description="Packages",
-                          rows="4", cols="52"),
-            form.Dropdown('limit', [(5, '05'), (10, '10'), (20, '20')],
-                          description = "Limit"),
-            form.Checkbox("strategy_cb", value=1, checked=False,
-                          description="Content-based"),
-            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("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"}
+    def __init__(self,selected_strategies):
+        desc_dict = {"cb": "Content-based", "cbt": "Content-based",
+                     "cbd": "Content-based", "col": "Collaborative",
+                     "hybrid": "Hybrib"}
         fields = []
-        for strategy in strategies:
+        for strategy in selected_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())
+        return render.index()
+
+class About:
+    def GET(self):
+        return render.about()
 class Thanks:
     def POST(self):
@@ -95,52 +76,108 @@ class Package:
             subtags = []
         return debtags
+class Request:
+    def __init__(self,web_input,user_id):
+        self.user_id = user_id
+        self.storage = web_input
+
+        self.pkgs_list = []
+        if web_input.has_key('pkgs_list'):
+            self.pkgs_list = web_input['pkgs_list'].encode('utf8').split()
+            print self.pkgs_list
+        print web_input['pkgs_file']
+        if web_input['pkgs_file']:
+            f = open(outputdir + "/packages_list", "wb")
+            lines = web_input['pkgs_file'].file.readlines()
+            print lines
+            if lines[0].startswith('POPULARITY-CONTEST'):
+                del lines[0]
+                del lines[-1]
+                package_name_field = 2
+            else:
+                package_name_field = 0
+            for line in lines:
+                self.pkgs_list.append(line.split()[package_name_field])
+                f.write(line)
+            f.close()
+
+        if web_input.has_key('limit'):
+            self.limit = int(web_input['limit'])
+        if web_input.has_key('profile_size'):
+            self.profile_size = int(web_input['profile_size'])
+        if web_input.has_key('weight'):
+            self.weight = web_input['weight'].encode('utf8')
+
+        self.selected_strategies = []
+        if web_input.has_key('strategy'):
+            if web_input['strategy'].encode('utf8') == "content":
+                if (web_input.has_key('tag') and web_input.has_key('desc')):
+                    self.selected_strategies.append("cb")
+                elif web_input.has_key('desc'):
+                    self.selected_strategies.append("cbd")
+                else:
+                    self.selected_strategies.append("cbt")
+            if web_input['strategy'].encode('utf8') == "collab":
+                self.selected_strategies.append("col")
+            if web_input['strategy'].encode('utf8') == "hybrid":
+                self.selected_strategies.append("hybrid")
+
+        if web_input.has_key('cluster'):
+            self.cluster = bool(web_input.has_key['cluster'].encode('utf8'))
+
+        if web_input.has_key('neighbours'):
+            self.neighbours = int(web_input['neighbours'])
+
+        self.profiles_set = set()
+        if web_input.has_key('profile_desktop'):
+            self.profiles = self.profiles.add("desktop")
+        if web_input.has_key('profile_admin'):
+            self.profiles = self.profiles.add("admin")
+        if web_input.has_key('profile_devel'):
+            self.profiles = self.profiles.add("devel")
+        if web_input.has_key('profile_science'):
+            self.profiles = self.profiles.add("science")
+        if web_input.has_key('profile_arts'):
+            self.profiles = self.profiles.add("arts")
+
+    def __str__(self):
+        return self.storage
+
+    def validates(self):
+        self.errors = []
+        if (not self.pkgs_list or not self.selected_strategies):
+            self.errors.append("No upload file or packages list was provided.")
+            return False
+        if not self.selected_strategies:
+            self.errors.append("No strategy was selected.")
+            return False
+        return True
+
+    def get_strategy_details(self):
+        return self.selected_strategies[0]
 class AppRecommender:
     def POST(self):
+        print "post",web.input()
         outputdir = tempfile.mkdtemp(prefix='',dir='./submissions/')
         user_id = outputdir.lstrip('./submissions/')
-        request = RequestForm()
-        request_info = web.input(pkgs_file={})
-        if not request.validates(request_info):
-            return render.error(request)
+        print web.input(pkgs_file={})
+        request = Request(web.input(pkgs_file={}),user_id)
+        if not request.validates():
+            return render.error(request.errors)
         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['pkgs_file'].value:
-                f = open(outputdir + "/packages_list", "wb")
-                lines = request_info['pkgs_file'].file.readlines()
-                print lines
-                if lines[0].startswith('POPULARITY-CONTEST'):
-                    del lines[0]
-                    del lines[-1]
-                    package_name_field = 2
-                else:
-                    package_name_field = 0
-                for line in lines:
-                    user_pkgs_list.append(line.split()[package_name_field])
-                    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")
-            recommends = self._recommends(user_id,user_pkgs_list,strategies, int(request_info['limit']))
+            recommendation = self._recommends(request)
             ### Getting package summary (short description) ###
             pkg_summaries = {}
             cache = apt.Cache()
-            for strategy, result in recommends.items():
+            for strategy, result in recommendation.items():
                 for pkg in result:
-                    pkg_summaries[pkg] = cache[pkg].candidate.summary
-            return render.apprec(recommends, pkg_summaries, FeedbackForm(strategies))
+                    try:
+                        pkg_summaries[pkg] = cache[pkg].candidate.summary
+                    except:
+                        pkg_summaries[pkg] = ""
+            return render.apprec(recommendation, pkg_summaries,
+                                 FeedbackForm(request.selected_strategies),request)
 # parsing json from screenshots - can be usefull in the future...
 #    def _packages_attrs(self, recommends): #recommends is result of _recommends()
@@ -156,18 +193,16 @@ class AppRecommender:
 #                recommended_pkgs_attrs[pkg_attrs_dict['name']] = pkg_attrs_dict
 #        return recommended_pkgs_attrs
-    def _recommends(self,user_id,user_pkgs_list,strategies,limit):
-        user = User(dict.fromkeys(user_pkgs_list,1),user_id)
+    def _recommends(self,request):
+        user = User(dict.fromkeys(request.pkgs_list,1),request.user_id)
         user.maximal_pkg_profile()
         cfg = Config()
         rec = Recommender(cfg)
         results = dict()
-        for strategy in strategies:
-            ### 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] = \
+        for strategy_str in request.selected_strategies:
+            rec.set_strategy(strategy_str)
+            prediction = rec.get_recommendation(user).get_prediction(request.limit)
+            results[strategy_str] = \
                 [result[0] for result in prediction]
         return results
@@ -181,9 +216,10 @@ def add_global_hook():
 render = web.template.render('templates/', base='layout')
 render_plain = web.template.render('templates/')
-urls = ('/',   			'Index',
-        '/apprec',	  	'AppRecommender',
+urls = ('/',   			    'Index',
+        '/apprec',	  	    'AppRecommender',
         '/thanks',   		'Thanks',
+        '/about',           'About',
         '/package/(.*)',  	'Package'
        )
@@ -0,0 +1,14 @@
+$var title: About
+$var mod = 'about';
+
+<div class="graybox">
+    <h1>What is this?</h1>
+<p>AppRecommender is a project in development that aims to provide solutions
+for application recommendation at the GNU/Linux world. It was initially thought
+as a Debian package recommender, but considering the multi-distro effort in
+providing platform independent solutions, it should also follow this
+principle.</p>
+</div>
+
+<div class="align-right"><img alt="AppRecommender logo" src="/static/images/AppRecommender-logo.jpg" width="320" /></div>
+
-$def with (recommends, pkg_summaries, form)
+$def with (recommends, pkg_summaries, form, request)
 $var title: Feedback
 $var mod = 'feedback';
-
 <script type="application/x-javascript">
 $$(document).ready(function() {
     inithandlers();
@@ -12,18 +11,19 @@ $$(document).ready(function() {
 </script>
 <div class="graybox">
-    <h1>Results per strategy</h1>
-<ul class="toc">
+    <h1>Details of recommendation strategy</h1>
+    $request.get_strategy_details()
+<!--<ul class="toc">
 $for strategy, result in recommends.items():
     <li><a href="#$strategy">$strategy</a></li>
 </ul>
-</div>
+</div>-->
-<form action="/thanks" method="post">
+<form action="/thanks" method="post" enctype="multipart/form-data">
 <table>
 <tbody>
 $for strategy, result in recommends.items():
-    <h2><a name="$strategy" id="$strategy">$strategy</a></h2>
+    <!--<h2><a name="$strategy" id="$strategy">$strategy</a></h2>-->
     <tr>
     $ count = 0
     $for pkg in result:
-$def with (form)
+$def with (error_msgs)
 $var title: Error
 $var mod = 'error';
@@ -11,10 +11,10 @@ $var mod = &#39;error&#39;;
 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><ul>
+$for e in error_msgs:
+    <b><li>$e</li></b>
+</ul></p>
 <p><a href="/">Go back</a> and try again. </p>
 <p>If you believe it is a bug, please report to <a
-$def with (action, method, form)
 $var title: Home
 $var mod = 'index';
 <div class="graybox">
-    <h1>What is this?</h1>
-<p>AppRecommender is a project in development that aims to provide solutions
-for application recommendation at the GNU/Linux world. It was initially thought
-as a Debian package recommender, but considering the multi-distro effort in
-providing platform independent solutions, it should also follow this
-principle.</p>
-</div>
+<h1>You might also like these packages...</h1>
-<div class="align-right"><img alt="AppRecommender logo" src="/static/images/AppRecommender-logo.jpg" width="320" /></div>
+<p>Provide a list of packages or upload a popcon submission file and you'll get
+a list of suggested packages automatically computed by AppRecommender. You can
+customize the recommender setup or let it randomly choose a setup for you.</p>
+<p>Please fill in the form that follows the recommendation results. Your
+feedback is very much appreciated!</p>
+<p>Enjoy it :)</p>
+</div>
+<!--<div class="align-right"><img alt="AppRecommender logo"
+src="/static/images/AppRecommender-logo.jpg" width="320" /></div>-->
-<form action="" name="weboptions">
+<form action="apprec" enctype="multipart/form-data" method="post" name="weboptions">
   <p>
+    <label>Upload file:<input type="file" id="pkgs_file" name="pkgs_file" size="35"/></label><br />
+    <label>Packages list:<textarea rows="2" cols="40" name="pkgs_list" id="pkgs_list"></textarea><label><br />
     <label>Profile size: <input type="text" name="profile_size" value="10"></label><br />
-    <label>Recommendations: <input type="text" name="recommendation_size" value="10"></label><br />
-    <label>Weighting scheme:<br /><input type="radio" name="scheme" value="BM25">BM25</label><br />
-    <label><input type="radio" name="scheme" value="trad"></label>Traditional<br />
-    <label>Strategy: <br /><input type="radio" name="strategy" value="content"> Content-based</label><br />
-    <label><input type="radio" name="strategy" value="collab"> Collaborative</label><br />
-    <label><input type="radio" name="strategy" value="hybrid"> Hybrid</label><br />
+    <label>Recommendation size: <input type="text" name="limit" value="10"></label><br />
+    <label>Weighting scheme:<br />
+        <input type="radio" name="weight" value="BM25" checked >BM25<br />
+        <input type="radio" name="weight" value="trad">Traditional<br />
+    </label>
+    <label>Strategy: <br />
+        <input type="radio" name="strategy" value="content" checked> Content-based<br />
+        <input type="radio" name="strategy" value="collab"> Collaborative<br />
+        <input type="radio" name="strategy" value="hybrid"> Hybrid<br />
+    </label>
  <!--   <label>Password:<input type="password" name="pass"></label> -->
-    <label style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 3px silver groove;"><input type="hidden" class="DEPENDS ON strategy BEING content OR strategy BEING hybrid"></label>
-    <label><input type="checkbox" name="ssh" class="DEPENDS ON strategy BEING content OR strategy BEING hybrid"> Tag</label>
-    <label><input type="checkbox" name="iis" class="DEPENDS ON strategy BEING content OR strategy BEING hybrid"> Description</label>
-    <br /><label><input type="checkbox" name="asp" class="DEPENDS ON strategy BEING collab OR strategy BEING hybrid"> Clustering</label><br />
-    <label>Neighbours: <input type="text" name="neighbours" class="DEPENDS ON strategy BEING collab OR strategy BEING hybrid" value="50"></label><br />
-
-    <label>Personal profile: <br /><input type="checkbox" name="user_desktop" checked class="DEPENDS ON strategy BEING hybrid">Desktop</label>
-    <label><input type="checkbox" name="neighbours" class="DEPENDS ON strategy BEING hybrid">Admin</label>
-    <label><input type="checkbox" name="neighbours" class="DEPENDS ON strategy BEING hybrid">Devel</label>
-    <label><input type="checkbox" name="neighbours" class="DEPENDS ON strategy BEING hybrid">Science</label>
-    <label><input type="checkbox" name="neighbours" class="DEPENDS ON strategy BEING hybrid">Arts</label>
+ <!--   <label style="margin-bottom: 1em; padding-bottom: 1em; border-bottom: 3px silver groove;"><input type="hidden" class="DEPENDS ON strategy BEING  content OR strategy BEING hybrid"></label> -->
+ </p><p>
+    <label>Content attributes:
+        <input type="radio" name="content" value="tag" class="DEPENDS ON strategy BEING content OR strategy BEING hybrid" checked> tag
+        <input type="radio" name="content" value="desc" class="DEPENDS ON strategy BEING content OR strategy BEING hybrid"> description
+        <input type="radio" name="content" value="full" class="DEPENDS ON strategy BEING content OR strategy BEING hybrid"> both
+    </label><br />
+    <label>Clustering
+        <input type="radio" name="cluster" value="True" class="DEPENDS ON strategy BEING collab OR strategy BEING hybrid" checked> Yes
+        <input type="radio" name="cluster" value="False" class="DEPENDS ON strategy BEING collab OR strategy BEING hybrid"> No
+    </label><br />
+    <label>Neighbours:
+        <input type="text" name="neighbours" class="DEPENDS ON strategy BEING collab OR strategy BEING hybrid" value="50">
+    </label><br />
+    <label>Personal profile:
+        <input type="checkbox" name="profile_desktop" class="DEPENDS ON strategy BEING hybrid" checked>Desktop
+        <input type="checkbox" name="profile_admin" class="DEPENDS ON strategy BEING hybrid">Admin
+        <input type="checkbox" name="profile_devel" class="DEPENDS ON strategy BEING hybrid">Devel
+        <input type="checkbox" name="profile_science" class="DEPENDS ON strategy BEING hybrid">Science
+        <input type="checkbox" name="profile_arts" class="DEPENDS ON strategy BEING hybrid">Arts
+    </label>
   </p>
 <input type="submit" />
 </form>
-<!--
-<form action="$action" enctype="multipart/form-data" method="$method">
-$:form.render()
-<br />
-<input type="submit" />
-</form>
--->
 $def with (content)
-$ url_base = "http://localhost:8080/"
+$ url_base = "http://localhost:8080"
 <!DOCTYPE html>
 <html lang="en"><head>
@@ -133,7 +133,7 @@ function hideMesg(){
       <div id="nav">
           <a href="$url_base">Home</a>
           |
-          <a href="http://www.ime.usp.br/~tassia/apprec.html">About</a>
+          <a href="$url_base/about">About</a>
           |
           <a href="http://github.com/tassia/AppRecommender">Devel</a>
       </div>
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+$var title: About
	2	+$var mod = 'about';
	3	+
	4	+<div class="graybox">
	5	+ <h1>What is this?</h1>
	6	+<p>AppRecommender is a project in development that aims to provide solutions
	7	+for application recommendation at the GNU/Linux world. It was initially thought
	8	+as a Debian package recommender, but considering the multi-distro effort in
	9	+providing platform independent solutions, it should also follow this
	10	+principle.</p>
	11	+</div>
	12	+
	13	+<div class="align-right"><img alt="AppRecommender logo" src="/static/images/AppRecommender-logo.jpg" width="320" /></div>
	14	+
1	$def with (content)	1	$def with (content)
2	-$ url_base = "http://localhost:8080/"	2	+$ url_base = "http://localhost:8080"
3		3
4	<!DOCTYPE html>	4	<!DOCTYPE html>
5	<html lang="en"><head>	5	<html lang="en"><head>
	@@ -133,7 +133,7 @@ function hideMesg(){		@@ -133,7 +133,7 @@ function hideMesg(){
133	<div id="nav">	133	<div id="nav">
134	<a href="$url_base">Home</a>	134	<a href="$url_base">Home</a>
135	\|	135	\|
136	- <a href="http://www.ime.usp.br/~tassia/apprec.html">About</a>	136	+ <a href="$url_base/about">About</a>
137	\|	137	\|
138	<a href="http://github.com/tassia/AppRecommender">Devel</a>	138	<a href="http://github.com/tassia/AppRecommender">Devel</a>
139	</div>	139	</div>