keboola.component 1.6.8__tar.gz → 1.6.9__tar.gz

{keboola.component-1.6.8/src/keboola.component.egg-info → keboola.component-1.6.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: keboola.component
-Version: 1.6.8
+Version: 1.6.9
 Summary: General library for Python applications running in Keboola Connection environment
 Home-page: https://github.com/keboola/python-component
 Author: Keboola KDS Team
@@ -98,8 +98,11 @@ e.g.
 - All Environment variables are loaded
 
 The optional parameter `data_folder_path` of the constructor is the path to the data directory. If not
-provided, [`KBC_DATADIR` environment variable](/extend/common-interface/environment/#environment-variables) will be
-used.
+provided it will be determined in this order:
+1.   [`KBC_DATADIR` environment variable](/extend/common-interface/environment/#environment-variables) if present
+2. -d / --data argument from the command line if present
+3. data folder inside the current working directory if present
+4. data folder inside the parent directory of the current working directory if present
 
 The class can be either extended or just instantiated and manipulated like object. The `CommonInterface` class is
 exposed in the `keboola.component` namespace:
@@ -182,7 +185,7 @@ first_table = input_tables[0]
 logging.info(f'The first table named: "{first_table.name}" is at path: {first_table.full_path}')
 
 # get information from table manifest
-logging.info(f'The first table has following columns defined in the manifest {first_table.columns}')
+logging.info(f'The first table has following columns defined in the manifest {first_table.column_names}')
 
 ```
 
@@ -242,7 +245,7 @@ ci = CommonInterface(data_folder_path='data')
 
 # create container for the result
 out = ci.create_out_table_definition("testDef",
-                                     columns=['foo', 'bar'],
+                                     schema=['foo', 'bar'],
                                      destination='some-destination',
                                      primary_key=['foo'],
                                      incremental=True,
@@ -641,7 +644,7 @@ class Component(ComponentBase):
         product_schema = self.get_table_schema_by_name('product')
         product_table = self.create_out_table_definition_from_schema(product_schema)
         with open(product_table.full_path, 'w') as outfile:
-            writer = csv.DictWriter(outfile, fieldnames=product_table.columns)
+            writer = csv.DictWriter(outfile, fieldnames=product_table.column_names)
             writer.writerows(DUMMY_PRODUCT_DATA)
         self.write_manifest(product_table)
  ```

{keboola.component-1.6.8 → keboola.component-1.6.9}/README.md

@@ -79,8 +79,11 @@ e.g.
 - All Environment variables are loaded
 
 The optional parameter `data_folder_path` of the constructor is the path to the data directory. If not
-provided, [`KBC_DATADIR` environment variable](/extend/common-interface/environment/#environment-variables) will be
-used.
+provided it will be determined in this order:
+1.   [`KBC_DATADIR` environment variable](/extend/common-interface/environment/#environment-variables) if present
+2. -d / --data argument from the command line if present
+3. data folder inside the current working directory if present
+4. data folder inside the parent directory of the current working directory if present
 
 The class can be either extended or just instantiated and manipulated like object. The `CommonInterface` class is
 exposed in the `keboola.component` namespace:
@@ -163,7 +166,7 @@ first_table = input_tables[0]
 logging.info(f'The first table named: "{first_table.name}" is at path: {first_table.full_path}')
 
 # get information from table manifest
-logging.info(f'The first table has following columns defined in the manifest {first_table.columns}')
+logging.info(f'The first table has following columns defined in the manifest {first_table.column_names}')
 
 ```
 
@@ -223,7 +226,7 @@ ci = CommonInterface(data_folder_path='data')
 
 # create container for the result
 out = ci.create_out_table_definition("testDef",
-                                     columns=['foo', 'bar'],
+                                     schema=['foo', 'bar'],
                                      destination='some-destination',
                                      primary_key=['foo'],
                                      incremental=True,
@@ -622,7 +625,7 @@ class Component(ComponentBase):
         product_schema = self.get_table_schema_by_name('product')
         product_table = self.create_out_table_definition_from_schema(product_schema)
         with open(product_table.full_path, 'w') as outfile:
-            writer = csv.DictWriter(outfile, fieldnames=product_table.columns)
+            writer = csv.DictWriter(outfile, fieldnames=product_table.column_names)
             writer.writerows(DUMMY_PRODUCT_DATA)
         self.write_manifest(product_table)
  ```

{keboola.component-1.6.8 → keboola.component-1.6.9}/setup.py

@@ -13,7 +13,7 @@ project_urls = {
 
 setuptools.setup(
     name="keboola.component",
-    version="1.6.8",
+    version="1.6.9",
     author="Keboola KDS Team",
     project_urls=project_urls,
     setup_requires=['pytest-runner', 'flake8'],

{keboola.component-1.6.8 → keboola.component-1.6.9}/src/keboola/component/dao.py

@@ -505,7 +505,6 @@ class ColumnDefinition:
     Represents the definition of a column within a table schema.
 
     Attributes:
-        name (Optional[str]): The name of the column. Defaults to None.
         data_types (Optional[Union[Dict[str, DataType], BaseType]]): Data types of the column for specified backend.
         This can be a specific `DataType` or a `BaseType`, or a dictionary mapping from a string to one of these types.
         Defaults to BaseType.String.

{keboola.component-1.6.8 → keboola.component-1.6.9}/src/keboola/component/interface.py

@@ -134,10 +134,14 @@ class CommonInterface:
         args, unknown = argparser.parse_known_args()
         data_folder_path = args.data_dir
 
-        if data_folder_path == '' and self.environment_variables.data_dir:
-            data_folder_path = self.environment_variables.data_dir
-        elif data_folder_path == '':
-            data_folder_path = '/data/'
+        if not data_folder_path:
+            cwd = Path(os.getcwd())
+            if self.environment_variables.data_dir:
+                data_folder_path = self.environment_variables.data_dir
+            elif cwd.resolve().joinpath('data').is_dir():
+                data_folder_path = cwd.resolve().joinpath('data').as_posix()
+            elif cwd.resolve().parent.joinpath('data').is_dir():
+                data_folder_path = cwd.resolve().parent.joinpath('data').as_posix()
 
         return data_folder_path
 

{keboola.component-1.6.8 → keboola.component-1.6.9/src/keboola.component.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: keboola.component
-Version: 1.6.8
+Version: 1.6.9
 Summary: General library for Python applications running in Keboola Connection environment
 Home-page: https://github.com/keboola/python-component
 Author: Keboola KDS Team
@@ -98,8 +98,11 @@ e.g.
 - All Environment variables are loaded
 
 The optional parameter `data_folder_path` of the constructor is the path to the data directory. If not
-provided, [`KBC_DATADIR` environment variable](/extend/common-interface/environment/#environment-variables) will be
-used.
+provided it will be determined in this order:
+1.   [`KBC_DATADIR` environment variable](/extend/common-interface/environment/#environment-variables) if present
+2. -d / --data argument from the command line if present
+3. data folder inside the current working directory if present
+4. data folder inside the parent directory of the current working directory if present
 
 The class can be either extended or just instantiated and manipulated like object. The `CommonInterface` class is
 exposed in the `keboola.component` namespace:
@@ -182,7 +185,7 @@ first_table = input_tables[0]
 logging.info(f'The first table named: "{first_table.name}" is at path: {first_table.full_path}')
 
 # get information from table manifest
-logging.info(f'The first table has following columns defined in the manifest {first_table.columns}')
+logging.info(f'The first table has following columns defined in the manifest {first_table.column_names}')
 
 ```
 
@@ -242,7 +245,7 @@ ci = CommonInterface(data_folder_path='data')
 
 # create container for the result
 out = ci.create_out_table_definition("testDef",
-                                     columns=['foo', 'bar'],
+                                     schema=['foo', 'bar'],
                                      destination='some-destination',
                                      primary_key=['foo'],
                                      incremental=True,
@@ -641,7 +644,7 @@ class Component(ComponentBase):
         product_schema = self.get_table_schema_by_name('product')
         product_table = self.create_out_table_definition_from_schema(product_schema)
         with open(product_table.full_path, 'w') as outfile:
-            writer = csv.DictWriter(outfile, fieldnames=product_table.columns)
+            writer = csv.DictWriter(outfile, fieldnames=product_table.column_names)
             writer.writerows(DUMMY_PRODUCT_DATA)
         self.write_manifest(product_table)
  ```