Merge branch 'develop'

Author: yipjustin

docs/source/conf.py

@@ -54,7 +54,7 @@
 # The short X.Y version.
 version = '0.8'
 # The full version, including alpha/beta/rc tags.
-release = '0.8.2'
+release = '0.8.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/predictionio.rst

@@ -10,7 +10,7 @@ The SDK comprises of two clients:
    and extract prediction results.
 
 Please read `PredictionIO Quick Start
-<http://docs.prediction.io/0.8.2/recommendation/quickstart.html>`_ for
+<http://docs.prediction.io/0.8.3/recommendation/quickstart.html>`_ for
 detailed explanation.
 
 predictionio.EventClient Class

examples/demo-movielens/batch_import.py

@@ -71,8 +71,8 @@ def batch_import_task(app_data, client, all_info=False):
         iid=v.iid,
         event_time=event_time,
         properties={ 
-          "pio_itypes": list(itypes),
-          "pio_starttime": release_datetime.isoformat(),
+          "itypes": list(itypes),
+          "starttime": release_datetime.isoformat(),
           "name": utf8_name,
           "year": v.year } )
 
@@ -94,12 +94,12 @@ def batch_import_task(app_data, client, all_info=False):
         sys.stdout.write('\r[Info] %s' % count)
         sys.stdout.flush()
 
-    properties = { "pio_rating" : int(v.rating) }
+    properties = { "rating" : int(v.rating) }
     req = client.acreate_event(
         event="rate",
-        entity_type="pio_user",
+        entity_type="user",
         entity_id=v.uid,
-        target_entity_type="pio_item",
+        target_entity_type="item",
         target_entity_id=v.iid,
         properties=properties,
         event_time=v.t.replace(tzinfo=pytz.utc),

examples/itemrank_quick_start.py

@@ -27,7 +27,7 @@ def import_itemrank(access_key):
   for item_id in item_ids:
     print "Set item", item_id
     client.set_item(item_id, {
-      "pio_itypes" : ['1']
+      "itypes" : ['1']
     })
 
   # each user randomly views 10 items

predictionio/__init__.py

@@ -5,7 +5,7 @@
 """
 
 
-__version__ = "0.8.2"
+__version__ = "0.8.3"
 
 # import deprecated libraries.
 from predictionio.obsolete import Client
@@ -228,7 +228,7 @@ def acreate_event(self, event, entity_type, entity_id,
     et_str = et.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + et.strftime("%z")
     data["eventTime"] = et_str
 
-    path = "/events.json?accessKey=" + self.access_key
+    path = "/events.json?accessKey=%s" % (self.access_key, )
     request = AsyncRequest("POST", path, **data)
     request.set_rfunc(self._acreate_resp)
     self._connection.make_request(request)
@@ -253,7 +253,7 @@ def aget_event(self, event_id):
     """
     enc_event_id = urllib.quote(event_id, "") # replace special char with %xx
     path = "/events/%s.json" % enc_event_id
-    request = AsyncRequest("GET", path)
+    request = AsyncRequest("GET", path, accessKey=self.access_key)
     request.set_rfunc(self._aget_resp)
     self._connection.make_request(request)
     return request
@@ -272,8 +272,8 @@ def adelete_event(self, event_id):
       AsyncRequest object. 
     """
     enc_event_id = urllib.quote(event_id, "") # replace special char with %xx
-    path = "/events/%s.json" % enc_event_id
-    request = AsyncRequest("DELETE", path)
+    path = "/events/%s.json" % (enc_event_id, )
+    request = AsyncRequest("DELETE", path, accessKey=self.access_key)
     request.set_rfunc(self._adelete_resp)
     self._connection.make_request(request)
     return request
@@ -288,11 +288,11 @@ def aset_user(self, uid, properties={}, event_time=None):
     """Set properties of a user.
    
     Wrapper of acreate_event function, setting event to "$set" and entity_type
-    to "pio_user".
+    to "user".
     """
     return self.acreate_event(
       event="$set",
-      entity_type="pio_user",
+      entity_type="user",
       entity_id=uid,
       properties=properties,
       event_time=event_time,
@@ -306,12 +306,12 @@ def aunset_user(self, uid, properties, event_time=None):
     """Unset properties of an user.
    
     Wrapper of acreate_event function, setting event to "$unset" and entity_type
-    to "pio_user".
+    to "user".
     """
     # check properties={}, it cannot be empty
     return self.acreate_event(
         event="$unset",
-        entity_type="pio_user",
+        entity_type="user",
         entity_id=uid,
         properties=properties,
         event_time=event_time,
@@ -325,11 +325,11 @@ def adelete_user(self, uid, event_time=None):
     """Delete a user.
    
     Wrapper of acreate_event function, setting event to "$delete" and entity_type
-    to "pio_user".
+    to "user".
     """
     return self.acreate_event(
         event="$delete",
-        entity_type="pio_user",
+        entity_type="user",
         entity_id=uid,
         event_time=event_time)
 
@@ -341,11 +341,11 @@ def aset_item(self, iid, properties={}, event_time=None):
     """Set properties of an item.
    
     Wrapper of acreate_event function, setting event to "$set" and entity_type
-    to "pio_item".
+    to "item".
     """
     return self.acreate_event(
         event="$set",
-        entity_type="pio_item",
+        entity_type="item",
         entity_id=iid,
         properties=properties,
         event_time=event_time)
@@ -358,11 +358,11 @@ def aunset_item(self, iid, properties={}, event_time=None):
     """Unset properties of an item.
    
     Wrapper of acreate_event function, setting event to "$unset" and entity_type
-    to "pio_item".
+    to "item".
     """
     return self.acreate_event(
         event="$unset",
-        entity_type="pio_item",
+        entity_type="item",
         entity_id=iid,
         properties=properties,
         event_time=event_time)
@@ -375,11 +375,11 @@ def adelete_item(self, iid, event_time=None):
     """Delete an item.
    
     Wrapper of acreate_event function, setting event to "$delete" and entity_type
-    to "pio_item".
+    to "item".
     """
     return self.acreate_event(
         event="$delete",
-        entity_type="pio_item",
+        entity_type="item",
         entity_id=iid,
         event_time=event_time)
 
@@ -391,14 +391,14 @@ def arecord_user_action_on_item(self, action, uid, iid, properties={},
       event_time=None):
     """Create a user-to-item action.
 
-    Wrapper of acreate_event function, setting entity_type to "pio_user" and
-    target_entity_type to "pio_item".
+    Wrapper of acreate_event function, setting entity_type to "user" and
+    target_entity_type to "item".
     """
     return self.acreate_event(
         event=action,
-        entity_type="pio_user",
+        entity_type="user",
         entity_id=uid,
-        target_entity_type="pio_item",
+        target_entity_type="item",
         target_entity_id=iid,
         properties=properties,
         event_time=event_time)

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name='PredictionIO',
-    version="0.8.2",
+    version="0.8.3",
     author=__author__,
     author_email=__email__,
     packages=['predictionio'],