You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2022/12/15 07:32:48 UTC

[iotdb] 02/04: refactor python udf package

This is an automated email from the ASF dual-hosted git repository.

rong pushed a commit to branch IOTDB-5195
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 4b262b96b2fc127b2f82218f0171cb16eb401e1e
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Wed Dec 14 04:38:56 2022 +0800

    refactor python udf package
---
 udf-py/{udf_api => udf}/__init__.py                        |  0
 udf-py/{udf_api/access => udf/api}/__init__.py             |  0
 udf-py/{udf_api/collector => udf/api/access}/__init__.py   |  0
 udf-py/{udf_api => udf/api}/access/row.py                  |  4 ++--
 udf-py/{udf_api => udf/api}/access/row_iterator.py         |  0
 udf-py/{udf_api => udf/api}/access/row_window.py           |  6 +++---
 .../{udf_api/customizer => udf/api/collector}/__init__.py  |  0
 udf-py/{udf_api => udf/api}/collector/point_collector.py   |  2 +-
 .../customizer/config => udf/api/customizer}/__init__.py   |  0
 .../parameter => udf/api/customizer/config}/__init__.py    |  0
 .../api}/customizer/config/udf_configurations.py           |  4 ++--
 .../api}/customizer/config/udtf_configurations.py          |  8 ++++----
 .../strategy => udf/api/customizer/parameter}/__init__.py  |  0
 .../api}/customizer/parameter/udf_parameter_validator.py   | 14 +++++++-------
 .../api}/customizer/parameter/udf_parameters.py            |  2 +-
 .../exception => udf/api/customizer/strategy}/__init__.py  |  0
 .../api}/customizer/strategy/access_strategy.py            |  2 +-
 .../api}/customizer/strategy/access_strategy_type.py       |  0
 .../api}/customizer/strategy/row_by_row_access_strategy.py |  4 ++--
 .../strategy/session_time_window_access_strategy.py        |  6 +++---
 .../strategy/sliding_size_window_access_strategy.py        |  6 +++---
 .../strategy/sliding_time_window_access_strategy.py        |  6 +++---
 .../customizer/strategy/state_window_access_strategy.py    |  6 +++---
 udf-py/{udf_api/type => udf/api/exception}/__init__.py     |  0
 .../api}/exception/udf_attribute_not_provided_exception.py |  2 +-
 udf-py/{udf_api => udf/api}/exception/udf_exception.py     |  0
 .../udf_input_series_data_type_not_valid_exception.py      |  4 ++--
 .../udf_input_series_index_not_valid_exception.py          |  2 +-
 .../udf_input_series_number_not_valid_exception.py         |  2 +-
 .../api}/exception/udf_management_exception.py             |  2 +-
 .../udf_output_series_data_type_not_valid_exception.py     |  2 +-
 .../api}/exception/udf_parameter_not_valid_exception.py    |  2 +-
 udf-py/{udf_runtime => udf/api/type}/__init__.py           |  0
 udf-py/{udf_api => udf/api}/type/binary.py                 |  0
 udf-py/{udf_api => udf/api}/type/type.py                   |  0
 udf-py/{udf_api => udf/api}/udf.py                         |  2 +-
 udf-py/{udf_api => udf/api}/udtf.py                        | 12 ++++++------
 udf-py/{udf_api => udf/runtime}/__init__.py                |  0
 38 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/udf-py/udf_api/__init__.py b/udf-py/udf/__init__.py
similarity index 100%
copy from udf-py/udf_api/__init__.py
copy to udf-py/udf/__init__.py
diff --git a/udf-py/udf_api/access/__init__.py b/udf-py/udf/api/__init__.py
similarity index 100%
rename from udf-py/udf_api/access/__init__.py
rename to udf-py/udf/api/__init__.py
diff --git a/udf-py/udf_api/collector/__init__.py b/udf-py/udf/api/access/__init__.py
similarity index 100%
rename from udf-py/udf_api/collector/__init__.py
rename to udf-py/udf/api/access/__init__.py
diff --git a/udf-py/udf_api/access/row.py b/udf-py/udf/api/access/row.py
similarity index 98%
rename from udf-py/udf_api/access/row.py
rename to udf-py/udf/api/access/row.py
index ae9e8b87a4..781de785ea 100644
--- a/udf-py/udf_api/access/row.py
+++ b/udf-py/udf/api/access/row.py
@@ -17,8 +17,8 @@
 
 from abc import ABCMeta, abstractmethod
 
-from udf_api.type.binary import Binary
-from udf_api.type.type import Type
+from udf.api.type.binary import Binary
+from udf.api.type.type import Type
 
 
 class Row(metaclass=ABCMeta):
diff --git a/udf-py/udf_api/access/row_iterator.py b/udf-py/udf/api/access/row_iterator.py
similarity index 100%
rename from udf-py/udf_api/access/row_iterator.py
rename to udf-py/udf/api/access/row_iterator.py
diff --git a/udf-py/udf_api/access/row_window.py b/udf-py/udf/api/access/row_window.py
similarity index 96%
rename from udf-py/udf_api/access/row_window.py
rename to udf-py/udf/api/access/row_window.py
index 783c2bb2bd..321fbd65da 100644
--- a/udf-py/udf_api/access/row_window.py
+++ b/udf-py/udf/api/access/row_window.py
@@ -18,9 +18,9 @@
 
 from abc import ABCMeta, abstractmethod
 
-from udf_api.access.row import Row
-from udf_api.access.row_iterator import RowIterator
-from udf_api.type.type import Type
+from udf.api.access.row import Row
+from udf.api.access.row_iterator import RowIterator
+from udf.api.type.type import Type
 
 
 class RowWindow(metaclass=ABCMeta):
diff --git a/udf-py/udf_api/customizer/__init__.py b/udf-py/udf/api/collector/__init__.py
similarity index 100%
rename from udf-py/udf_api/customizer/__init__.py
rename to udf-py/udf/api/collector/__init__.py
diff --git a/udf-py/udf_api/collector/point_collector.py b/udf-py/udf/api/collector/point_collector.py
similarity index 99%
rename from udf-py/udf_api/collector/point_collector.py
rename to udf-py/udf/api/collector/point_collector.py
index 2c35439222..9143917c94 100644
--- a/udf-py/udf_api/collector/point_collector.py
+++ b/udf-py/udf/api/collector/point_collector.py
@@ -17,7 +17,7 @@
 
 from abc import ABCMeta, abstractmethod
 
-from udf_api.type.binary import Binary
+from udf.api.type.binary import Binary
 
 
 class PointCollector(metaclass=ABCMeta):
diff --git a/udf-py/udf_api/customizer/config/__init__.py b/udf-py/udf/api/customizer/__init__.py
similarity index 100%
rename from udf-py/udf_api/customizer/config/__init__.py
rename to udf-py/udf/api/customizer/__init__.py
diff --git a/udf-py/udf_api/customizer/parameter/__init__.py b/udf-py/udf/api/customizer/config/__init__.py
similarity index 100%
rename from udf-py/udf_api/customizer/parameter/__init__.py
rename to udf-py/udf/api/customizer/config/__init__.py
diff --git a/udf-py/udf_api/customizer/config/udf_configurations.py b/udf-py/udf/api/customizer/config/udf_configurations.py
similarity index 92%
rename from udf-py/udf_api/customizer/config/udf_configurations.py
rename to udf-py/udf/api/customizer/config/udf_configurations.py
index 14f9a45d2a..5385590075 100644
--- a/udf-py/udf_api/customizer/config/udf_configurations.py
+++ b/udf-py/udf/api/customizer/config/udf_configurations.py
@@ -17,8 +17,8 @@
 
 from abc import ABCMeta
 
-from udf_api.exception.udf_exception import UDFException
-from udf_api.type.type import Type
+from udf.api.exception.udf_exception import UDFException
+from udf.api.type.type import Type
 
 
 class UDFConfigurations(metaclass=ABCMeta):
diff --git a/udf-py/udf_api/customizer/config/udtf_configurations.py b/udf-py/udf/api/customizer/config/udtf_configurations.py
similarity index 90%
rename from udf-py/udf_api/customizer/config/udtf_configurations.py
rename to udf-py/udf/api/customizer/config/udtf_configurations.py
index 99881bc26b..b9aeb32ed2 100644
--- a/udf-py/udf_api/customizer/config/udtf_configurations.py
+++ b/udf-py/udf/api/customizer/config/udtf_configurations.py
@@ -15,10 +15,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from udf_api.customizer.config.udf_configurations import UDFConfigurations
-from udf_api.customizer.strategy.access_strategy import AccessStrategy
-from udf_api.exception.udf_exception import UDFException
-from udf_api.type.type import Type
+from udf.api.customizer import UDFConfigurations
+from udf.api.customizer import AccessStrategy
+from udf.api.exception import UDFException
+from udf.api.type import Type
 
 
 class UDTFConfigurations(UDFConfigurations):
diff --git a/udf-py/udf_api/customizer/strategy/__init__.py b/udf-py/udf/api/customizer/parameter/__init__.py
similarity index 100%
rename from udf-py/udf_api/customizer/strategy/__init__.py
rename to udf-py/udf/api/customizer/parameter/__init__.py
diff --git a/udf-py/udf_api/customizer/parameter/udf_parameter_validator.py b/udf-py/udf/api/customizer/parameter/udf_parameter_validator.py
similarity index 92%
rename from udf-py/udf_api/customizer/parameter/udf_parameter_validator.py
rename to udf-py/udf/api/customizer/parameter/udf_parameter_validator.py
index 0194b60765..6b2df67f51 100644
--- a/udf-py/udf_api/customizer/parameter/udf_parameter_validator.py
+++ b/udf-py/udf/api/customizer/parameter/udf_parameter_validator.py
@@ -17,23 +17,23 @@
 
 from typing import List
 
-from udf_api.customizer.parameter.udf_parameters import UDFParameters
-from udf_api.exception.udf_attribute_not_provided_exception import (
+from udf.api.customizer.parameter.udf_parameters import UDFParameters
+from udf.api.exception.udf_attribute_not_provided_exception import (
     UDFAttributeNotProvidedException,
 )
-from udf_api.exception.udf_input_series_data_type_not_valid_exception import (
+from udf.api.exception.udf_input_series_data_type_not_valid_exception import (
     UDFInputSeriesDataTypeNotValidException,
 )
-from udf_api.exception.udf_input_series_index_not_valid_exception import (
+from udf.api.exception.udf_input_series_index_not_valid_exception import (
     UDFInputSeriesIndexNotValidException,
 )
-from udf_api.exception.udf_input_series_number_not_valid_exception import (
+from udf.api.exception.udf_input_series_number_not_valid_exception import (
     UDFInputSeriesNumberNotValidException,
 )
-from udf_api.exception.udf_parameter_not_valid_exception import (
+from udf.api.exception.udf_parameter_not_valid_exception import (
     UDFParameterNotValidException,
 )
-from udf_api.type.type import Type
+from udf.api.type.type import Type
 
 
 class UDFParameterValidator:
diff --git a/udf-py/udf_api/customizer/parameter/udf_parameters.py b/udf-py/udf/api/customizer/parameter/udf_parameters.py
similarity index 98%
rename from udf-py/udf_api/customizer/parameter/udf_parameters.py
rename to udf-py/udf/api/customizer/parameter/udf_parameters.py
index 90fc64c05b..4294da1652 100644
--- a/udf-py/udf_api/customizer/parameter/udf_parameters.py
+++ b/udf-py/udf/api/customizer/parameter/udf_parameters.py
@@ -17,7 +17,7 @@
 
 from typing import Dict, List
 
-from udf_api.type.type import Type
+from udf.api.type.type import Type
 
 
 # Used in UDTF#beforeStart(UDFParameters, UDTFConfigurations).
diff --git a/udf-py/udf_api/exception/__init__.py b/udf-py/udf/api/customizer/strategy/__init__.py
similarity index 100%
rename from udf-py/udf_api/exception/__init__.py
rename to udf-py/udf/api/customizer/strategy/__init__.py
diff --git a/udf-py/udf_api/customizer/strategy/access_strategy.py b/udf-py/udf/api/customizer/strategy/access_strategy.py
similarity index 95%
rename from udf-py/udf_api/customizer/strategy/access_strategy.py
rename to udf-py/udf/api/customizer/strategy/access_strategy.py
index 007aba9ce8..0ea5dccc25 100644
--- a/udf-py/udf_api/customizer/strategy/access_strategy.py
+++ b/udf-py/udf/api/customizer/strategy/access_strategy.py
@@ -17,7 +17,7 @@
 
 from abc import ABCMeta, abstractmethod
 
-from udf_api.customizer.strategy.access_strategy_type import AccessStrategyType
+from udf.api.customizer.strategy.access_strategy_type import AccessStrategyType
 
 
 class AccessStrategy(metaclass=ABCMeta):
diff --git a/udf-py/udf_api/customizer/strategy/access_strategy_type.py b/udf-py/udf/api/customizer/strategy/access_strategy_type.py
similarity index 100%
rename from udf-py/udf_api/customizer/strategy/access_strategy_type.py
rename to udf-py/udf/api/customizer/strategy/access_strategy_type.py
diff --git a/udf-py/udf_api/customizer/strategy/row_by_row_access_strategy.py b/udf-py/udf/api/customizer/strategy/row_by_row_access_strategy.py
similarity index 92%
rename from udf-py/udf_api/customizer/strategy/row_by_row_access_strategy.py
rename to udf-py/udf/api/customizer/strategy/row_by_row_access_strategy.py
index 39a272a276..f1c97270a8 100644
--- a/udf-py/udf_api/customizer/strategy/row_by_row_access_strategy.py
+++ b/udf-py/udf/api/customizer/strategy/row_by_row_access_strategy.py
@@ -15,8 +15,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from udf_api.customizer.strategy.access_strategy import AccessStrategy
-from udf_api.customizer.strategy.access_strategy_type import AccessStrategyType
+from udf.api.customizer.strategy.access_strategy import AccessStrategy
+from udf.api.customizer.strategy.access_strategy_type import AccessStrategyType
 
 
 class RowByRowAccessStrategy(AccessStrategy):
diff --git a/udf-py/udf_api/customizer/strategy/session_time_window_access_strategy.py b/udf-py/udf/api/customizer/strategy/session_time_window_access_strategy.py
similarity index 93%
rename from udf-py/udf_api/customizer/strategy/session_time_window_access_strategy.py
rename to udf-py/udf/api/customizer/strategy/session_time_window_access_strategy.py
index b9d2bb72b1..3992342271 100644
--- a/udf-py/udf_api/customizer/strategy/session_time_window_access_strategy.py
+++ b/udf-py/udf/api/customizer/strategy/session_time_window_access_strategy.py
@@ -15,9 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from udf_api.customizer.strategy.access_strategy import AccessStrategy
-from udf_api.customizer.strategy.access_strategy_type import AccessStrategyType
-from udf_api.exception.udf_exception import UDFException
+from udf.api.customizer.strategy.access_strategy import AccessStrategy
+from udf.api.customizer.strategy.access_strategy_type import AccessStrategyType
+from udf.api.exception.udf_exception import UDFException
 
 
 class SessionTimeWindowAccessStrategy(AccessStrategy):
diff --git a/udf-py/udf_api/customizer/strategy/sliding_size_window_access_strategy.py b/udf-py/udf/api/customizer/strategy/sliding_size_window_access_strategy.py
similarity index 95%
rename from udf-py/udf_api/customizer/strategy/sliding_size_window_access_strategy.py
rename to udf-py/udf/api/customizer/strategy/sliding_size_window_access_strategy.py
index 4f992847e9..37b141503e 100644
--- a/udf-py/udf_api/customizer/strategy/sliding_size_window_access_strategy.py
+++ b/udf-py/udf/api/customizer/strategy/sliding_size_window_access_strategy.py
@@ -15,9 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from udf_api.customizer.strategy.access_strategy import AccessStrategy
-from udf_api.customizer.strategy.access_strategy_type import AccessStrategyType
-from udf_api.exception.udf_exception import UDFException
+from udf.api.customizer.strategy.access_strategy import AccessStrategy
+from udf.api.customizer.strategy.access_strategy_type import AccessStrategyType
+from udf.api.exception.udf_exception import UDFException
 
 
 class SlidingSizeWindowAccessStrategy(AccessStrategy):
diff --git a/udf-py/udf_api/customizer/strategy/sliding_time_window_access_strategy.py b/udf-py/udf/api/customizer/strategy/sliding_time_window_access_strategy.py
similarity index 96%
rename from udf-py/udf_api/customizer/strategy/sliding_time_window_access_strategy.py
rename to udf-py/udf/api/customizer/strategy/sliding_time_window_access_strategy.py
index 3aaaecc4b6..1ff474036b 100644
--- a/udf-py/udf_api/customizer/strategy/sliding_time_window_access_strategy.py
+++ b/udf-py/udf/api/customizer/strategy/sliding_time_window_access_strategy.py
@@ -15,9 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from udf_api.customizer.strategy.access_strategy import AccessStrategy
-from udf_api.customizer.strategy.access_strategy_type import AccessStrategyType
-from udf_api.exception.udf_exception import UDFException
+from udf.api.customizer.strategy.access_strategy import AccessStrategy
+from udf.api.customizer.strategy.access_strategy_type import AccessStrategyType
+from udf.api.exception.udf_exception import UDFException
 
 
 class SlidingTimeWindowAccessStrategy(AccessStrategy):
diff --git a/udf-py/udf_api/customizer/strategy/state_window_access_strategy.py b/udf-py/udf/api/customizer/strategy/state_window_access_strategy.py
similarity index 93%
rename from udf-py/udf_api/customizer/strategy/state_window_access_strategy.py
rename to udf-py/udf/api/customizer/strategy/state_window_access_strategy.py
index fb6d35b142..fb5d7b422e 100644
--- a/udf-py/udf_api/customizer/strategy/state_window_access_strategy.py
+++ b/udf-py/udf/api/customizer/strategy/state_window_access_strategy.py
@@ -15,9 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from udf_api.customizer.strategy.access_strategy import AccessStrategy
-from udf_api.customizer.strategy.access_strategy_type import AccessStrategyType
-from udf_api.exception.udf_exception import UDFException
+from udf.api.customizer.strategy.access_strategy import AccessStrategy
+from udf.api.customizer.strategy.access_strategy_type import AccessStrategyType
+from udf.api.exception.udf_exception import UDFException
 
 
 class StateWindowAccessStrategy(AccessStrategy):
diff --git a/udf-py/udf_api/type/__init__.py b/udf-py/udf/api/exception/__init__.py
similarity index 100%
rename from udf-py/udf_api/type/__init__.py
rename to udf-py/udf/api/exception/__init__.py
diff --git a/udf-py/udf_api/exception/udf_attribute_not_provided_exception.py b/udf-py/udf/api/exception/udf_attribute_not_provided_exception.py
similarity index 94%
rename from udf-py/udf_api/exception/udf_attribute_not_provided_exception.py
rename to udf-py/udf/api/exception/udf_attribute_not_provided_exception.py
index 7ffc44c181..011a69c5d5 100644
--- a/udf-py/udf_api/exception/udf_attribute_not_provided_exception.py
+++ b/udf-py/udf/api/exception/udf_attribute_not_provided_exception.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from udf_api.exception.udf_parameter_not_valid_exception import (
+from udf.api.exception.udf_parameter_not_valid_exception import (
     UDFParameterNotValidException,
 )
 
diff --git a/udf-py/udf_api/exception/udf_exception.py b/udf-py/udf/api/exception/udf_exception.py
similarity index 100%
rename from udf-py/udf_api/exception/udf_exception.py
rename to udf-py/udf/api/exception/udf_exception.py
diff --git a/udf-py/udf_api/exception/udf_input_series_data_type_not_valid_exception.py b/udf-py/udf/api/exception/udf_input_series_data_type_not_valid_exception.py
similarity index 92%
rename from udf-py/udf_api/exception/udf_input_series_data_type_not_valid_exception.py
rename to udf-py/udf/api/exception/udf_input_series_data_type_not_valid_exception.py
index d7c4bbea1a..2a2be78639 100644
--- a/udf-py/udf_api/exception/udf_input_series_data_type_not_valid_exception.py
+++ b/udf-py/udf/api/exception/udf_input_series_data_type_not_valid_exception.py
@@ -17,10 +17,10 @@
 
 from typing import List
 
-from udf_api.exception.udf_parameter_not_valid_exception import (
+from udf.api.exception.udf_parameter_not_valid_exception import (
     UDFParameterNotValidException,
 )
-from udf_api.type.type import Type
+from udf.api.type.type import Type
 
 
 class UDFInputSeriesDataTypeNotValidException(UDFParameterNotValidException):
diff --git a/udf-py/udf_api/exception/udf_input_series_index_not_valid_exception.py b/udf-py/udf/api/exception/udf_input_series_index_not_valid_exception.py
similarity index 94%
rename from udf-py/udf_api/exception/udf_input_series_index_not_valid_exception.py
rename to udf-py/udf/api/exception/udf_input_series_index_not_valid_exception.py
index 8fe059ca82..64558c7699 100644
--- a/udf-py/udf_api/exception/udf_input_series_index_not_valid_exception.py
+++ b/udf-py/udf/api/exception/udf_input_series_index_not_valid_exception.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from udf_api.exception.udf_parameter_not_valid_exception import (
+from udf.api.exception.udf_parameter_not_valid_exception import (
     UDFParameterNotValidException,
 )
 
diff --git a/udf-py/udf_api/exception/udf_input_series_number_not_valid_exception.py b/udf-py/udf/api/exception/udf_input_series_number_not_valid_exception.py
similarity index 95%
rename from udf-py/udf_api/exception/udf_input_series_number_not_valid_exception.py
rename to udf-py/udf/api/exception/udf_input_series_number_not_valid_exception.py
index 25287fde64..99221a1e34 100644
--- a/udf-py/udf_api/exception/udf_input_series_number_not_valid_exception.py
+++ b/udf-py/udf/api/exception/udf_input_series_number_not_valid_exception.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from udf_api.exception.udf_parameter_not_valid_exception import (
+from udf.api.exception.udf_parameter_not_valid_exception import (
     UDFParameterNotValidException,
 )
 
diff --git a/udf-py/udf_api/exception/udf_management_exception.py b/udf-py/udf/api/exception/udf_management_exception.py
similarity index 94%
rename from udf-py/udf_api/exception/udf_management_exception.py
rename to udf-py/udf/api/exception/udf_management_exception.py
index cc3165a617..26cc79ad69 100644
--- a/udf-py/udf_api/exception/udf_management_exception.py
+++ b/udf-py/udf/api/exception/udf_management_exception.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from udf_api.exception.udf_exception import UDFException
+from udf.api.exception.udf_exception import UDFException
 
 
 class UDFManagementException(UDFException):
diff --git a/udf-py/udf_api/exception/udf_output_series_data_type_not_valid_exception.py b/udf-py/udf/api/exception/udf_output_series_data_type_not_valid_exception.py
similarity index 94%
rename from udf-py/udf_api/exception/udf_output_series_data_type_not_valid_exception.py
rename to udf-py/udf/api/exception/udf_output_series_data_type_not_valid_exception.py
index c2ef7146a9..7982993f22 100644
--- a/udf-py/udf_api/exception/udf_output_series_data_type_not_valid_exception.py
+++ b/udf-py/udf/api/exception/udf_output_series_data_type_not_valid_exception.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from udf_api.exception.udf_parameter_not_valid_exception import (
+from udf.api.exception.udf_parameter_not_valid_exception import (
     UDFParameterNotValidException,
 )
 
diff --git a/udf-py/udf_api/exception/udf_parameter_not_valid_exception.py b/udf-py/udf/api/exception/udf_parameter_not_valid_exception.py
similarity index 94%
rename from udf-py/udf_api/exception/udf_parameter_not_valid_exception.py
rename to udf-py/udf/api/exception/udf_parameter_not_valid_exception.py
index 69279acf90..90d2c4ce97 100644
--- a/udf-py/udf_api/exception/udf_parameter_not_valid_exception.py
+++ b/udf-py/udf/api/exception/udf_parameter_not_valid_exception.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from udf_api.exception.udf_exception import UDFException
+from udf.api.exception.udf_exception import UDFException
 
 
 class UDFParameterNotValidException(UDFException):
diff --git a/udf-py/udf_runtime/__init__.py b/udf-py/udf/api/type/__init__.py
similarity index 100%
rename from udf-py/udf_runtime/__init__.py
rename to udf-py/udf/api/type/__init__.py
diff --git a/udf-py/udf_api/type/binary.py b/udf-py/udf/api/type/binary.py
similarity index 100%
rename from udf-py/udf_api/type/binary.py
rename to udf-py/udf/api/type/binary.py
diff --git a/udf-py/udf_api/type/type.py b/udf-py/udf/api/type/type.py
similarity index 100%
rename from udf-py/udf_api/type/type.py
rename to udf-py/udf/api/type/type.py
diff --git a/udf-py/udf_api/udf.py b/udf-py/udf/api/udf.py
similarity index 95%
rename from udf-py/udf_api/udf.py
rename to udf-py/udf/api/udf.py
index 22bbaa1e25..d355141c2b 100644
--- a/udf-py/udf_api/udf.py
+++ b/udf-py/udf/api/udf.py
@@ -17,7 +17,7 @@
 
 from abc import ABCMeta
 
-from udf_api.customizer.parameter.udf_parameter_validator import UDFParameterValidator
+from udf.api.customizer.parameter.udf_parameter_validator import UDFParameterValidator
 
 
 class UDF(metaclass=ABCMeta):
diff --git a/udf-py/udf_api/udtf.py b/udf-py/udf/api/udtf.py
similarity index 93%
rename from udf-py/udf_api/udtf.py
rename to udf-py/udf/api/udtf.py
index 9c1bf4dbf7..8cd7c3c2e1 100644
--- a/udf-py/udf_api/udtf.py
+++ b/udf-py/udf/api/udtf.py
@@ -16,12 +16,12 @@
 # under the License.
 from abc import abstractmethod
 
-from udf_api.access.row import Row
-from udf_api.access.row_window import RowWindow
-from udf_api.collector.point_collector import PointCollector
-from udf_api.customizer.config.udtf_configurations import UDTFConfigurations
-from udf_api.customizer.parameter.udf_parameters import UDFParameters
-from udf_api.udf import UDF
+from udf.api.access.row import Row
+from udf.api.access.row_window import RowWindow
+from udf.api.collector.point_collector import PointCollector
+from udf.api.customizer.config.udtf_configurations import UDTFConfigurations
+from udf.api.customizer.parameter.udf_parameters import UDFParameters
+from udf.api.udf import UDF
 
 
 class UDTF(UDF):
diff --git a/udf-py/udf_api/__init__.py b/udf-py/udf/runtime/__init__.py
similarity index 100%
rename from udf-py/udf_api/__init__.py
rename to udf-py/udf/runtime/__init__.py