added query

3 files changed, 31 insertions, 9 deletions

diff --git a/ricky/param/constrainednumber.py b/ricky/param/constrainednumber.py
index 3af3bf9..8585481 100644
--- a/ricky/param/constrainednumber.py
+++ b/ricky/param/constrainednumber.py
@@ -30,21 +30,26 @@ class ConstrainedNumber(Param):
             value > self.range_max
         ):
             raise ValueError(
-                "Value must be between %s and %s\n" % (
-                    self.range_min, self.range_max
+                "Value for %s must be between %s and %s\n" % (
+                    self.name, self.range_min, self.range_max
                 )
             )
         if value == self.forbidden:
             raise ValueError(
-                "Value %s is forbidden" % value
+                "Value %s for %s is forbidden" % (value, value.name)
             )
         if (self.forbidden_range_max or self.forbidden_range_max == 0) and \
            (self.forbidden_range_min or self.forbidden_range_min == 0) and \
            self.forbidden_range_min <= value and \
            self.forbidden_range_max >= value:
                 raise ValueError(
-                    "In forbidden range: Value %s is above %s and below %s" %
-                    (value, self.forbidden_range_min, self.forbidden_range_max)
+                    "In forbidden range: " +
+                    "Value %s for %s is above %s and below %s" % (
+                        value,
+                        self.name,
+                        self.forbidden_range_min,
+                        self.forbidden_range_max
+                    )
                 )
         if self.enforce_int and type(value) != int:
             raise ValueError(
@@ -81,7 +86,6 @@ class ConstrainedNumber(Param):
             self._generate_random()
         except ValueError:
             tries += 1
-            print "TRIES:%s\n" % tries
             if tries < tries_max:
                 self.randomize(tries=tries)
             else:
diff --git a/ricky/params.py b/ricky/params.py
index 476e0d2..8724a0d 100644
--- a/ricky/params.py
+++ b/ricky/params.py
@@ -88,4 +88,4 @@ class Params(object):
         """set param values manually from a dictionary"""
         for param in self._params:
             if param.name in params_dict.keys():
-                param.value_set(params_dict[param.name])
+                param.value = params_dict[param.name]
diff --git a/ricky/pb.py b/ricky/pb.py
index 2b07737..10674f2 100644
--- a/ricky/pb.py
+++ b/ricky/pb.py
@@ -1,3 +1,4 @@
+import os
 import urllib
 import urllib2
 import sys
@@ -41,9 +42,9 @@ class Pb(object):
     def call(self, params):
         if self._offline:
             sys.path.append("./photoblaster")
-            from photoblaster.modules import Pb
+            from photoblaster.modules import Pb as _Pb
             from photoblaster.config import LOCAL as PBLOCAL
-            for pbcls in Pb.__subclasses__():
+            for pbcls in _Pb.__subclasses__():
                 if pbcls.__name__ == self.__class__.__name__:
                     params_dict = params.as_dict()
                     instance = pbcls(**params_dict)
@@ -54,3 +55,20 @@ class Pb(object):
         return json.loads(
             self.post_request(self.url, params.as_dict())
         )
+
+    def params_from_url(self, url):
+        """
+        retrieves image params from db using the url
+        """
+        if self._offline:
+            sys.path.append("./photoblaster")
+            from photoblaster.db.models.imcmd import ImCmd
+            newfile = os.path.split(url)[-1]
+            files = ImCmd.search({"newfile": newfile})
+            if not len(files):
+                return None
+            filedata = json.loads(files[0].dataobj)
+            return filedata
+        else:
+            # needs a route
+            raise NotImplementedError("Not yet implemented\n")