Просмотр исходного кода

Merge pull request #18 from lnyemba/v2.2.0

V2.2.0 - bug fixes mongodb, console
Steve L. Nyemba 10 месяцев назад
Родитель
Сommit
53e4ab39dc
4 измененных файлов с 9 добавлено и 7 удалено
  1. 1 1
      info/__init__.py
  2. 5 5
      notebooks/s3.ipynb
  3. 2 0
      transport/nosql/mongodb.py
  4. 1 1
      transport/other/__init__.py

+ 1 - 1
info/__init__.py

@@ -1,6 +1,6 @@
 __app_name__  = 'data-transport'
 __author__ = 'The Phi Technology'
-__version__= '2.2.1'
+__version__= '2.2.2'
 __email__  = "info@the-phi.com"
 __license__=f"""
 Copyright 2010 - 2024, Steve L. Nyemba

+ 5 - 5
notebooks/s3.ipynb

@@ -6,12 +6,12 @@
    "source": [
     "#### Writing to AWS S3\n",
     "\n",
-    "We have setup our demo environment with the label **aws** passed to reference our s3 access_key and secret_key and file. In the cell below we will write the data to our aws s3 bucket named **com.phi.demo**"
+    "We have setup our demo environment with the label **aws** passed to reference our s3 access_key and secret_key and file (called friends.csv). In the cell below we will write the data to our aws s3 bucket named **com.phi.demo**"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [
     {
@@ -30,7 +30,7 @@
     "from transport import providers\n",
     "import pandas as pd\n",
     "_data = pd.DataFrame({\"name\":['James Bond','Steve Rogers','Steve Nyemba'],'age':[55,150,44]})\n",
-    "mgw = transport.get.writer(label='aws',file='friends.csv',bucket='com.phi.demo')\n",
+    "mgw = transport.get.writer(label='aws')\n",
     "mgw.write(_data)\n",
     "print (transport.__version__)"
    ]
@@ -54,7 +54,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [
     {
@@ -79,7 +79,7 @@
     "def cast(stream) :\n",
     "    print (stream)\n",
     "    return pd.DataFrame(str(stream))\n",
-    "mgr = transport.get.reader(label='aws', bucket='com.phi.demo',file='friends.csv')\n",
+    "mgr = transport.get.reader(label='aws')\n",
     "_df = mgr.read()\n",
     "print (_df)\n",
     "print ('--------- STATISTICS ------------')\n",

+ 2 - 0
transport/nosql/mongodb.py

@@ -33,6 +33,8 @@ class Mongo :
             :password   password for current user
         """
         self.host = 'localhost' if 'host' not in args else args['host']
+        if ':' not in self.host and 'port' in args :
+            self.host = ':'.join([self.host,str(args['port'])])
         self.mechanism= 'SCRAM-SHA-256' if 'mechanism' not in args else args['mechanism']
         # authSource=(args['authSource'] if 'authSource' in args else self.dbname)
         self._lock = False if 'lock' not in args else args['lock']

+ 1 - 1
transport/other/__init__.py

@@ -1 +1 @@
-from . import files, http, rabbitmq, callback, files
+from . import files, http, rabbitmq, callback, files