big update

Author: robswc

pyproject.toml

@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"

setup.cfg

@@ -0,0 +1,24 @@
+[metadata]
+name = quickbase-json-api-client
+version = 0.0.1
+author = Robert Carroll
+author_email = rob@shenandoah.capital
+description = Python wrapper for quickbase JSON API.
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://github.com/robswc/quickbase-json-api-client
+project_urls =
+    Bug Tracker = https://github.com/robswc/quickbase-json-api-client/issues
+classifiers =
+    Programming Language :: Python :: 3
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+
+[options]
+package_dir =
+    = src
+packages = find:
+python_requires = >=3.6
+
+[options.packages.find]
+where = src

setup.py

@@ -1,11 +1,16 @@
 import requests
-import json
-
 
+from src.quickbase_json.qb_response import QBResponse
 
 
 class QuickbaseJSONClient:
     def __init__(self, realm, auth, **kwargs):
+        """
+        Creates a client object.
+        :param realm: quickbase realm
+        :param auth: quickbase user token
+        :param kwargs:
+        """
         self.realm = realm
         self.auth = auth
         self.headers = {
@@ -30,12 +35,21 @@ def query_records(self, table: str, select: list, where: str, **kwargs):
         :return: json data of records {data: ..., fields: ...}
         """
 
+        # create request body
         body = {'from': table, 'select': select, 'where': where}
+        # update with keyword args
+        body.update(kwargs)
 
         # add optional args
         body.update(kwargs)
+        r = requests.post('https://api.quickbase.com/v1/records/query', headers=self.headers, json=body).json()
+
+        # create response object
+        res = QBResponse('records')
 
-        return requests.post('https://api.quickbase.com/v1/records/query', headers=self.headers, json=body).json()
+        # update response object with JSON data from request
+        res.update(r)
+        return res
 
     def insert_update_records(self, table: str, data: list):
         """

quickbase_json/__init__.py renamed to src/quickbase_json/__init__.py

@@ -37,7 +37,7 @@ def __init__(self, fid: any, operator: str, value: any, **kwargs):
 
     def build(self, **kwargs):
 
-        if kwargs.get('join') == 'OR':
+        if kwargs.get('join'):
             # check that value is a list
             if isinstance(self.value, list) is False:
                 raise IncorrectParameters(self.value, list)
@@ -48,7 +48,7 @@ def build(self, **kwargs):
                 queries.append(build_query_str(self.fid, self.operator, v))
 
             # return chain of queries
-            return 'OR'.join(queries)
+            return f"{kwargs.get('join')}".join(queries)
 
         return build_query_str(self.fid, self.operator, self.value)
 

quickbase_json/client.py renamed to src/quickbase_json/client.py

@@ -0,0 +1,38 @@
+from src.quickbase_json.client import QuickbaseJSONClient
+
+
+class LinkedRecord:
+    def __init__(self, table, rid, table_name='default', fid=3, **kwargs):
+        self.tables = {}
+        self.attributes = {}
+        self.add_link(table, rid, table_name, fid)
+
+    def add_link(self, table_id, rid, table_name='default', fid=3):
+        if table_name == 'default':
+            table_name = table_id
+        self.tables.update({table_id: {'rid': rid, 'fid': fid, 'alias': table_name}})
+
+    def add_attribute(self, key, value):
+        self.attributes.update({key: value})
+
+    def build(self, use_aliases=False):
+        pass
+
+
+class LinkedRecordFactory:
+    def __init__(self, realm, auth_token, table_id):
+        self.realm = realm
+        self.table_id = table_id
+        self.records = {}
+        self.client = QuickbaseJSONClient(realm, auth_token)
+
+    def set_root(self, table, fid, where):
+        records = self.client.query_records(table, fid, where)
+        self.records = records
+        return records
+
+    def add_link(self, source_table, fid, table):
+        pass
+
+    def add_links(self, links):
+        pass

quickbase_json/helpers.py renamed to src/quickbase_json/helpers.py

@@ -140,7 +140,7 @@ def orient(self, orient, **kwargs):
     def currency(self, currency_type):
         return self
 
-    def transform(self, transformation):
+    def transform(self, transformation, **kwargs):
         """
         Transforms the data, given a transformation argument.
         :param transformation: type of transformation.
@@ -179,7 +179,6 @@ def transform(self, transformation):
 
             for field in fields:
                 if field.get('type') == 'date time':
-
                     if type(self.get('data') == list):
                         for row in data:
                             dt_field = row.get(str(field.get('id')))
@@ -192,6 +191,20 @@ def transform(self, transformation):
                                 dt = datetime.datetime.strptime(str_dt, '%Y-%m-%dT%H:%M:%S.%fZ')
                                 row.update({str(field.get('id')): {'value': dt}})
 
+                if field.get('type') == 'date':
+                    if type(self.get('data') == list):
+                        for row in data:
+                            dt_field = row.get(str(field.get('id')))
+                            if dt_field.get('value') is None:
+                                str_dt = dt_field
+                                dt = datetime.datetime.strptime(str_dt, kwargs.get('datestring'))
+                                row.update({str(field.get('id')): dt})
+                            else:
+                                str_dt = dt_field.get('value')
+                                dt = datetime.datetime.strptime(str_dt, kwargs.get('datestring'))
+                                row.update({str(field.get('id')): {'value': dt}})
+
+
         if transformation == 'intround':
             """Rounds numbers and transforms them to ints"""
 

src/quickbase_json/qb_linked_record.py

@@ -1,14 +1,14 @@
-import datetime
+
 
 import pytest
 
-from quickbase_json import client as qbc
-from quickbase_json.helpers import Where, IncorrectParameters
-from quickbase_json.helpers import Sort as qbs
-from quickbase_json.helpers import Group as qbg
+
 
 
 # test where
+from src.quickbase_json.helpers import Where, IncorrectParameters
+
+
 @pytest.mark.parametrize('fid, operator, value, expected', [
     (3, 'EX', 12345, '{3.EX.12345}'),
     (3, 'XEX', 12345, '{3.XEX.12345}'),