Cleanup, update sample file

Author: danielebriggi

.devcontainer/Dockerfile

@@ -3,4 +3,4 @@ FROM mcr.microsoft.com/devcontainers/python:3.6-bullseye
 ADD https://dl.yarnpkg.com/debian/pubkey.gpg /etc/apt/trusted.gpg.d/yarn.asc
 
 RUN chmod +r /etc/apt/trusted.gpg.d/*.asc && \
-    echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list
+    echo "deb http://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list

.pylintrc

@@ -6,4 +6,4 @@ pytest==7.0.1
 pytest-mock==3.6.1
 black==22.8.0
 python-dotenv==0.20.0
-lz4==3.1.10
+lz4==3.1.10

Makefile

@@ -1 +1 @@
-lz4==3.1.10
+lz4==3.1.10

requirements-dev.txt

@@ -13,20 +13,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 8,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Loading SQLITECLOUD lib from: /Users/sam/projects/codermine/sqlitecloud-sdk/C/libsqcloud.so\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
-    "from sqlitecloud.conn_info import user,password,host,db_name,port\n",
-    "from sqlitecloud.client import SqliteCloudClient, SqliteCloudAccount"
+    "import sys\n",
+    "\n",
+    "sys.path.append('/workspaces/python/src')\n",
+    "\n",
+    "from sqlitecloud.conn_info import user, password, host, db_name, port\n",
+    "from sqlitecloud.client import SqliteCloudClient\n",
+    "from sqlitecloud.types import SqliteCloudAccount"
    ]
   },
   {
@@ -40,27 +37,27 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [],
    "source": [
-    "account = SqliteCloudAccount(user, password, host, db_name, port)\n",
+    "account = SqliteCloudAccount(user, password, host, db_name, int(port))\n",
     "client = SqliteCloudClient(cloud_account=account)\n",
     "conn = client.open_connection()"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "'people'"
+       "'chinook.sqlite'"
       ]
      },
-     "execution_count": 3,
+     "execution_count": 10,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -78,17 +75,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 15,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "select * from employees;\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "query = \"select * from employees;\"\n",
     "result = client.exec_query(query, conn)"
@@ -103,21 +92,21 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "{'emp_id': 1, 'emp_name': b'Bobby Tables'}\n",
-      "{'emp_id': 1, 'emp_name': b'Bobby Tables'}\n",
-      "{'emp_id': 1, 'emp_name': b'Bobby Tables'}\n",
-      "{'emp_id': 1, 'emp_name': b'Bobby Tables'}\n",
-      "{'emp_id': 1, 'emp_name': b'Bobby Tables'}\n",
-      "{'emp_id': 1, 'emp_name': b'Bobby Tables'}\n",
-      "{'emp_id': 1, 'emp_name': b'Bobby Tables'}\n",
-      "{'emp_id': 1, 'emp_name': b'Bobby Tables'}\n"
+      "{'EmployeeId': '1', 'LastName': 'Adams', 'FirstName': 'Andrew', 'Title': 'General Manager', 'ReportsTo': None, 'BirthDate': '1962-02-18 00:00:00', 'HireDate': '2002-08-14 00:00:00', 'Address': '11120 Jasper Ave NW', 'City': 'Edmonton', 'State': 'AB', 'Country': 'Canada', 'PostalCode': 'T5K 2N1', 'Phone': '+1 (780) 428-9482', 'Fax': '+1 (780) 428-3457', 'Email': 'andrew@chinookcorp.com'}\n",
+      "{'EmployeeId': '2', 'LastName': 'Edwards', 'FirstName': 'Nancy', 'Title': 'Sales Manager', 'ReportsTo': '1', 'BirthDate': '1958-12-08 00:00:00', 'HireDate': '2002-05-01 00:00:00', 'Address': '825 8 Ave SW', 'City': 'Calgary', 'State': 'AB', 'Country': 'Canada', 'PostalCode': 'T2P 2T3', 'Phone': '+1 (403) 262-3443', 'Fax': '+1 (403) 262-3322', 'Email': 'nancy@chinookcorp.com'}\n",
+      "{'EmployeeId': '3', 'LastName': 'Peacock', 'FirstName': 'Jane', 'Title': 'Sales Support Agent', 'ReportsTo': '2', 'BirthDate': '1973-08-29 00:00:00', 'HireDate': '2002-04-01 00:00:00', 'Address': '1111 6 Ave SW', 'City': 'Calgary', 'State': 'AB', 'Country': 'Canada', 'PostalCode': 'T2P 5M5', 'Phone': '+1 (403) 262-3443', 'Fax': '+1 (403) 262-6712', 'Email': 'jane@chinookcorp.com'}\n",
+      "{'EmployeeId': '4', 'LastName': 'Park', 'FirstName': 'Margaret', 'Title': 'Sales Support Agent', 'ReportsTo': '2', 'BirthDate': '1947-09-19 00:00:00', 'HireDate': '2003-05-03 00:00:00', 'Address': '683 10 Street SW', 'City': 'Calgary', 'State': 'AB', 'Country': 'Canada', 'PostalCode': 'T2P 5G3', 'Phone': '+1 (403) 263-4423', 'Fax': '+1 (403) 263-4289', 'Email': 'margaret@chinookcorp.com'}\n",
+      "{'EmployeeId': '5', 'LastName': 'Johnson', 'FirstName': 'Steve', 'Title': 'Sales Support Agent', 'ReportsTo': '2', 'BirthDate': '1965-03-03 00:00:00', 'HireDate': '2003-10-17 00:00:00', 'Address': '7727B 41 Ave', 'City': 'Calgary', 'State': 'AB', 'Country': 'Canada', 'PostalCode': 'T3B 1Y7', 'Phone': '1 (780) 836-9987', 'Fax': '1 (780) 836-9543', 'Email': 'steve@chinookcorp.com'}\n",
+      "{'EmployeeId': '6', 'LastName': 'Mitchell', 'FirstName': 'Michael', 'Title': 'IT Manager', 'ReportsTo': '1', 'BirthDate': '1973-07-01 00:00:00', 'HireDate': '2003-10-17 00:00:00', 'Address': '5827 Bowness Road NW', 'City': 'Calgary', 'State': 'AB', 'Country': 'Canada', 'PostalCode': 'T3B 0C5', 'Phone': '+1 (403) 246-9887', 'Fax': '+1 (403) 246-9899', 'Email': 'michael@chinookcorp.com'}\n",
+      "{'EmployeeId': '7', 'LastName': 'King', 'FirstName': 'Robert', 'Title': 'IT Staff', 'ReportsTo': '6', 'BirthDate': '1970-05-29 00:00:00', 'HireDate': '2004-01-02 00:00:00', 'Address': '590 Columbia Boulevard West', 'City': 'Lethbridge', 'State': 'AB', 'Country': 'Canada', 'PostalCode': 'T1K 5N8', 'Phone': '+1 (403) 456-9986', 'Fax': '+1 (403) 456-8485', 'Email': 'robert@chinookcorp.com'}\n",
+      "{'EmployeeId': '8', 'LastName': 'Callahan', 'FirstName': 'Laura', 'Title': 'IT Staff', 'ReportsTo': '6', 'BirthDate': '1968-01-09 00:00:00', 'HireDate': '2004-03-04 00:00:00', 'Address': '923 7 ST NW', 'City': 'Lethbridge', 'State': 'AB', 'Country': 'Canada', 'PostalCode': 'T1H 1Y8', 'Phone': '+1 (403) 467-3351', 'Fax': '+1 (403) 467-8772', 'Email': 'laura@chinookcorp.com'}\n"
      ]
     }
    ],
@@ -135,41 +124,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 17,
    "metadata": {},
    "outputs": [],
    "source": [
     "client.disconnect(conn)\n"
    ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "You can bind values to parametric queries: you can pass parameters as positional values in an array"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 7,
-   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "ev type: <class 'int'>\n",
-      "ev type: <class 'str'>\n"
-     ]
-    }
-   ],
-   "source": [
-    "new_connection = client.open_connection()\n",
-    "result = client.exec_statement(\"select * from employees where emp_id = ? and emp_name = ? \", [1,'Bobby Tables'],conn=new_connection)\n",
-    "for r in result:\n",
-    "    print(r)\n",
-    "client.disconnect(conn)"
-   ]
   }
  ],
  "metadata": {
@@ -188,7 +148,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.6"
+   "version": "3.6.15"
   }
  },
  "nbformat": 4,

requirements.txt

@@ -1,7 +1,7 @@
 """ Module to interact with remote SqliteCloud database
 
 """
-from typing import Any, List, Optional
+from typing import Optional
 from urllib import parse
 
 from sqlitecloud.driver import Driver
@@ -37,8 +37,6 @@ def __init__(
 
         self.config = SQCloudConfig()
 
-        # for pb in pub_subs:
-        #     self._pub_sub_cbs.append(("channel1", SQCloudPubSubCB(pb)))
         if connection_str:
             self.config = self._parse_connection_string(connection_str)
         elif cloud_account:
@@ -53,24 +51,16 @@ def open_connection(self) -> SQCloudConnect:
             SQCloudConnect: An instance of the SQCloudConnect class representing the connection to the SQCloud server.
 
         Raises:
-            Exception: If an error occurs while opening the connection.
+            SQCloudException: If an error occurs while opening the connection.
         """
         connection = self.driver.connect(
             self.config.account.hostname, self.config.account.port, self.config
         )
 
-        # SQCloudExec(connection, f"USE DATABASE {self.dbname};")
-
-        # for cb in self._pub_sub_cbs:
-        #     subscribe_pub_sub(connection, cb[0], cb[1])
-
         return connection
 
     def disconnect(self, conn: SQCloudConnect) -> None:
-        """Closes the connection to the database.
-
-        This method is used to close the connection to the database.
-        """
+        """Close the connection to the database."""
         self.driver.disconnect(conn)
 
     def exec_query(
@@ -146,7 +136,7 @@ def _parse_connection_string(self, connection_string) -> SQCloudConfig:
             path = params.path
             database = path.strip("/")
             if database:
-                config.account.database = database
+                config.account.dbname = database
 
             config.account.hostname = params.hostname
             config.account.port = (

samples.ipynb

@@ -1,7 +1,6 @@
 import ssl
 from typing import Optional, Union
 import lz4.block
-from sqlitecloud.lz4_custom import lz4decode
 from sqlitecloud.resultset import SQCloudResult
 from sqlitecloud.types import (
     SQCLOUD_CMD,
@@ -48,6 +47,9 @@ def connect(
                 context.load_cert_chain(
                     certfile=config.certificate, keyfile=config.certificate_key
                 )
+            if config.no_verify_certificate:
+                context.check_hostname = False
+                context.verify_mode = ssl.CERT_NONE
 
             sock = context.wrap_socket(sock, server_hostname=hostname)
 
@@ -103,10 +105,10 @@ def _internal_config_apply(
             command = "HASH" if config.account.password_hashed else "PASSWORD"
             buffer += f"AUTH USER {config.account.username} {command} {config.account.password};"
 
-        if config.account.database:
+        if config.account.dbname:
             if config.create and not config.memory:
-                buffer += f"CREATE DATABASE {config.account.database} IF NOT EXISTS;"
-            buffer += f"USE DATABASE {config.account.database};"
+                buffer += f"CREATE DATABASE {config.account.dbname} IF NOT EXISTS;"
+            buffer += f"USE DATABASE {config.account.dbname};"
 
         if config.compression:
             buffer += "SET CLIENT KEY COMPRESSION TO 1;"

src/sqlitecloud/client.py

@@ -56,42 +56,39 @@ def __init__(self) -> None:
 
 
 class SqliteCloudAccount:
-    def __init__(self):
+    def __init__(
+        self,
+        username: Optional[str] = "",
+        password: Optional[str] = "",
+        hostname: Optional[str] = "",
+        dbname: Optional[str] = "",
+        port: Optional[int] = 8860,
+        apikey: Optional[str] = "",
+    ) -> None:
         # User name is required unless connectionstring is provided
-        self.username = ""
+        self.username = username
         # Password is required unless connection string is provided
-        self.password = ""
+        self.password = password
         # Password is hashed
         self.password_hashed = False
         # API key instead of username and password
-        self.apikey = ""
+        self.apikey = apikey
         # Name of database to open
-        self.database = ""
+        self.dbname = dbname
         # Like mynode.sqlitecloud.io
-        self.hostname = ""
-        self.port = 8860
+        self.hostname = hostname
+        self.port = port
 
 
 class SQCloudConnect:
-    def __init__(self):
-        self.hostname: str = ""
-        self.port: int = ""
+    """
+    Represents the connection information.
+    """
 
+    def __init__(self):
         self.socket: any = None
-
         self.config: SQCloudConfig
-
         self.isblob: bool = False
-        self.config_to_free: bool  # todo: is this needed?
-
-        # pub/sub
-        # todo: check uuid type
-        self.uuid: str
-
-        # todo:
-        # pubsubfd: int
-
-        # callback: SQCloudPubSubCB
 
 
 class SQCloudConfig: