From eaa66d00014ed614a510f51edd43d27f1f23e942 Mon Sep 17 00:00:00 2001 From: Nok Lam Chan Date: Wed, 31 May 2023 15:58:07 +0100 Subject: [PATCH 1/2] Update settings.py (#133) * Update logging to use kedro.logging.RichHandler Signed-off-by: Nok Chan * Update Settings.py Signed-off-by: Nok Chan --------- Signed-off-by: Nok Chan --- .../conf/base/logging.yml | 6 ++++- .../settings.py | 22 ++++++++++------- .../conf/base/logging.yml | 6 ++++- .../settings.py | 24 +++++++++++-------- .../conf/base/logging.yml | 6 ++++- .../settings.py | 21 +++++++++------- .../conf/base/logging.yml | 6 ++++- .../settings.py | 21 +++++++++------- .../conf/base/logging.yml | 6 ++++- .../settings.py | 22 ++++++++++------- 10 files changed, 89 insertions(+), 51 deletions(-) diff --git a/astro-airflow-iris/{{ cookiecutter.repo_name }}/conf/base/logging.yml b/astro-airflow-iris/{{ cookiecutter.repo_name }}/conf/base/logging.yml index 934e6152..c6a6fc70 100644 --- a/astro-airflow-iris/{{ cookiecutter.repo_name }}/conf/base/logging.yml +++ b/astro-airflow-iris/{{ cookiecutter.repo_name }}/conf/base/logging.yml @@ -24,7 +24,11 @@ handlers: delay: True rich: - class: rich.logging.RichHandler + class: kedro.logging.RichHandler + rich_tracebacks: True + # Advance options for customisation. + # See https://docs.kedro.org/en/stable/logging/logging.html#project-side-logging-configuration + # tracebacks_show_locals: False loggers: kedro: diff --git a/astro-airflow-iris/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py b/astro-airflow-iris/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py index a87a87d3..86a92b1c 100644 --- a/astro-airflow-iris/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py +++ b/astro-airflow-iris/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py @@ -3,6 +3,7 @@ https://kedro.readthedocs.io/en/stable/kedro_project_setup/settings.html.""" # Instantiated project hooks. +# For example, after creating a hooks.py and defining a ProjectHooks class there, do # from {{cookiecutter.python_package}}.hooks import ProjectHooks # HOOKS = (ProjectHooks(),) @@ -10,28 +11,31 @@ # DISABLE_HOOKS_FOR_PLUGINS = ("kedro-viz",) # Class that manages storing KedroSession data. -# from kedro.framework.session.shelvestore import ShelveStore -# SESSION_STORE_CLASS = ShelveStore +# from kedro.framework.session.store import BaseSessionStore +# SESSION_STORE_CLASS = BaseSessionStore # Keyword arguments to pass to the `SESSION_STORE_CLASS` constructor. # SESSION_STORE_ARGS = { # "path": "./sessions" # } -# Class that manages Kedro's library components. -# from kedro.framework.context import KedroContext -# CONTEXT_CLASS = KedroContext - # Directory that holds configuration. # CONF_SOURCE = "conf" # Class that manages how configuration is loaded. -# from kedro.config import TemplatedConfigLoader -# CONFIG_LOADER_CLASS = TemplatedConfigLoader +# from kedro.config import OmegaConfigLoader +# CONFIG_LOADER_CLASS = OmegaConfigLoader # Keyword arguments to pass to the `CONFIG_LOADER_CLASS` constructor. # CONFIG_LOADER_ARGS = { -# "globals_pattern": "*globals.yml", +# "config_patterns": { +# "spark" : ["spark*/"], +# "parameters": ["parameters*", "parameters*/**", "**/parameters*"], +# } # } +# Class that manages Kedro's library components. +# from kedro.framework.context import KedroContext +# CONTEXT_CLASS = KedroContext + # Class that manages the Data Catalog. # from kedro.io import DataCatalog # DATA_CATALOG_CLASS = DataCatalog diff --git a/pandas-iris/{{ cookiecutter.repo_name }}/conf/base/logging.yml b/pandas-iris/{{ cookiecutter.repo_name }}/conf/base/logging.yml index 934e6152..c6a6fc70 100644 --- a/pandas-iris/{{ cookiecutter.repo_name }}/conf/base/logging.yml +++ b/pandas-iris/{{ cookiecutter.repo_name }}/conf/base/logging.yml @@ -24,7 +24,11 @@ handlers: delay: True rich: - class: rich.logging.RichHandler + class: kedro.logging.RichHandler + rich_tracebacks: True + # Advance options for customisation. + # See https://docs.kedro.org/en/stable/logging/logging.html#project-side-logging-configuration + # tracebacks_show_locals: False loggers: kedro: diff --git a/pandas-iris/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py b/pandas-iris/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py index 31715216..86a92b1c 100644 --- a/pandas-iris/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py +++ b/pandas-iris/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py @@ -3,35 +3,39 @@ https://kedro.readthedocs.io/en/stable/kedro_project_setup/settings.html.""" # Instantiated project hooks. -# from {{ cookiecutter.python_package }}.hooks import ProjectHooks +# For example, after creating a hooks.py and defining a ProjectHooks class there, do +# from {{cookiecutter.python_package}}.hooks import ProjectHooks # HOOKS = (ProjectHooks(),) # Installed plugins for which to disable hook auto-registration. # DISABLE_HOOKS_FOR_PLUGINS = ("kedro-viz",) # Class that manages storing KedroSession data. -# from kedro.framework.session.shelvestore import ShelveStore -# SESSION_STORE_CLASS = ShelveStore +# from kedro.framework.session.store import BaseSessionStore +# SESSION_STORE_CLASS = BaseSessionStore # Keyword arguments to pass to the `SESSION_STORE_CLASS` constructor. # SESSION_STORE_ARGS = { # "path": "./sessions" # } -# Class that manages Kedro's library components. -# from kedro.framework.context import KedroContext -# CONTEXT_CLASS = KedroContext - # Directory that holds configuration. # CONF_SOURCE = "conf" # Class that manages how configuration is loaded. -# from kedro.config import TemplatedConfigLoader -# CONFIG_LOADER_CLASS = TemplatedConfigLoader +# from kedro.config import OmegaConfigLoader +# CONFIG_LOADER_CLASS = OmegaConfigLoader # Keyword arguments to pass to the `CONFIG_LOADER_CLASS` constructor. # CONFIG_LOADER_ARGS = { -# "globals_pattern": "*globals.yml", +# "config_patterns": { +# "spark" : ["spark*/"], +# "parameters": ["parameters*", "parameters*/**", "**/parameters*"], +# } # } +# Class that manages Kedro's library components. +# from kedro.framework.context import KedroContext +# CONTEXT_CLASS = KedroContext + # Class that manages the Data Catalog. # from kedro.io import DataCatalog # DATA_CATALOG_CLASS = DataCatalog diff --git a/pyspark-iris/{{ cookiecutter.repo_name }}/conf/base/logging.yml b/pyspark-iris/{{ cookiecutter.repo_name }}/conf/base/logging.yml index c49b9122..c1f1fca8 100644 --- a/pyspark-iris/{{ cookiecutter.repo_name }}/conf/base/logging.yml +++ b/pyspark-iris/{{ cookiecutter.repo_name }}/conf/base/logging.yml @@ -24,7 +24,11 @@ handlers: delay: True rich: - class: rich.logging.RichHandler + class: kedro.logging.RichHandler + rich_tracebacks: True + # Advance options for customisation. + # See https://docs.kedro.org/en/stable/logging/logging.html#project-side-logging-configuration + # tracebacks_show_locals: False loggers: kedro: diff --git a/pyspark-iris/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py b/pyspark-iris/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py index e5593b1c..34a68e9c 100644 --- a/pyspark-iris/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py +++ b/pyspark-iris/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py @@ -11,28 +11,31 @@ # DISABLE_HOOKS_FOR_PLUGINS = ("kedro-viz",) # Class that manages storing KedroSession data. -# from kedro.framework.session.shelvestore import ShelveStore -# SESSION_STORE_CLASS = ShelveStore +# from kedro.framework.session.store import BaseSessionStore +# SESSION_STORE_CLASS = BaseSessionStore # Keyword arguments to pass to the `SESSION_STORE_CLASS` constructor. # SESSION_STORE_ARGS = { # "path": "./sessions" # } -# Class that manages Kedro's library components. -# from kedro.framework.context import KedroContext -# CONTEXT_CLASS = KedroContext - # Directory that holds configuration. # CONF_SOURCE = "conf" # Class that manages how configuration is loaded. -# from kedro.config import TemplatedConfigLoader -# CONFIG_LOADER_CLASS = TemplatedConfigLoader +# from kedro.config import OmegaConfigLoader +# CONFIG_LOADER_CLASS = OmegaConfigLoader # Keyword arguments to pass to the `CONFIG_LOADER_CLASS` constructor. # CONFIG_LOADER_ARGS = { -# "globals_pattern": "*globals.yml", +# "config_patterns": { +# "spark" : ["spark*/"], +# "parameters": ["parameters*", "parameters*/**", "**/parameters*"], +# } # } +# Class that manages Kedro's library components. +# from kedro.framework.context import KedroContext +# CONTEXT_CLASS = KedroContext + # Class that manages the Data Catalog. # from kedro.io import DataCatalog # DATA_CATALOG_CLASS = DataCatalog diff --git a/pyspark/{{ cookiecutter.repo_name }}/conf/base/logging.yml b/pyspark/{{ cookiecutter.repo_name }}/conf/base/logging.yml index 934e6152..c6a6fc70 100644 --- a/pyspark/{{ cookiecutter.repo_name }}/conf/base/logging.yml +++ b/pyspark/{{ cookiecutter.repo_name }}/conf/base/logging.yml @@ -24,7 +24,11 @@ handlers: delay: True rich: - class: rich.logging.RichHandler + class: kedro.logging.RichHandler + rich_tracebacks: True + # Advance options for customisation. + # See https://docs.kedro.org/en/stable/logging/logging.html#project-side-logging-configuration + # tracebacks_show_locals: False loggers: kedro: diff --git a/pyspark/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py b/pyspark/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py index e5593b1c..34a68e9c 100644 --- a/pyspark/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py +++ b/pyspark/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py @@ -11,28 +11,31 @@ # DISABLE_HOOKS_FOR_PLUGINS = ("kedro-viz",) # Class that manages storing KedroSession data. -# from kedro.framework.session.shelvestore import ShelveStore -# SESSION_STORE_CLASS = ShelveStore +# from kedro.framework.session.store import BaseSessionStore +# SESSION_STORE_CLASS = BaseSessionStore # Keyword arguments to pass to the `SESSION_STORE_CLASS` constructor. # SESSION_STORE_ARGS = { # "path": "./sessions" # } -# Class that manages Kedro's library components. -# from kedro.framework.context import KedroContext -# CONTEXT_CLASS = KedroContext - # Directory that holds configuration. # CONF_SOURCE = "conf" # Class that manages how configuration is loaded. -# from kedro.config import TemplatedConfigLoader -# CONFIG_LOADER_CLASS = TemplatedConfigLoader +# from kedro.config import OmegaConfigLoader +# CONFIG_LOADER_CLASS = OmegaConfigLoader # Keyword arguments to pass to the `CONFIG_LOADER_CLASS` constructor. # CONFIG_LOADER_ARGS = { -# "globals_pattern": "*globals.yml", +# "config_patterns": { +# "spark" : ["spark*/"], +# "parameters": ["parameters*", "parameters*/**", "**/parameters*"], +# } # } +# Class that manages Kedro's library components. +# from kedro.framework.context import KedroContext +# CONTEXT_CLASS = KedroContext + # Class that manages the Data Catalog. # from kedro.io import DataCatalog # DATA_CATALOG_CLASS = DataCatalog diff --git a/spaceflights/{{ cookiecutter.repo_name }}/conf/base/logging.yml b/spaceflights/{{ cookiecutter.repo_name }}/conf/base/logging.yml index 934e6152..c6a6fc70 100644 --- a/spaceflights/{{ cookiecutter.repo_name }}/conf/base/logging.yml +++ b/spaceflights/{{ cookiecutter.repo_name }}/conf/base/logging.yml @@ -24,7 +24,11 @@ handlers: delay: True rich: - class: rich.logging.RichHandler + class: kedro.logging.RichHandler + rich_tracebacks: True + # Advance options for customisation. + # See https://docs.kedro.org/en/stable/logging/logging.html#project-side-logging-configuration + # tracebacks_show_locals: False loggers: kedro: diff --git a/spaceflights/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py b/spaceflights/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py index a87a87d3..86a92b1c 100644 --- a/spaceflights/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py +++ b/spaceflights/{{ cookiecutter.repo_name }}/src/{{ cookiecutter.python_package }}/settings.py @@ -3,6 +3,7 @@ https://kedro.readthedocs.io/en/stable/kedro_project_setup/settings.html.""" # Instantiated project hooks. +# For example, after creating a hooks.py and defining a ProjectHooks class there, do # from {{cookiecutter.python_package}}.hooks import ProjectHooks # HOOKS = (ProjectHooks(),) @@ -10,28 +11,31 @@ # DISABLE_HOOKS_FOR_PLUGINS = ("kedro-viz",) # Class that manages storing KedroSession data. -# from kedro.framework.session.shelvestore import ShelveStore -# SESSION_STORE_CLASS = ShelveStore +# from kedro.framework.session.store import BaseSessionStore +# SESSION_STORE_CLASS = BaseSessionStore # Keyword arguments to pass to the `SESSION_STORE_CLASS` constructor. # SESSION_STORE_ARGS = { # "path": "./sessions" # } -# Class that manages Kedro's library components. -# from kedro.framework.context import KedroContext -# CONTEXT_CLASS = KedroContext - # Directory that holds configuration. # CONF_SOURCE = "conf" # Class that manages how configuration is loaded. -# from kedro.config import TemplatedConfigLoader -# CONFIG_LOADER_CLASS = TemplatedConfigLoader +# from kedro.config import OmegaConfigLoader +# CONFIG_LOADER_CLASS = OmegaConfigLoader # Keyword arguments to pass to the `CONFIG_LOADER_CLASS` constructor. # CONFIG_LOADER_ARGS = { -# "globals_pattern": "*globals.yml", +# "config_patterns": { +# "spark" : ["spark*/"], +# "parameters": ["parameters*", "parameters*/**", "**/parameters*"], +# } # } +# Class that manages Kedro's library components. +# from kedro.framework.context import KedroContext +# CONTEXT_CLASS = KedroContext + # Class that manages the Data Catalog. # from kedro.io import DataCatalog # DATA_CATALOG_CLASS = DataCatalog From dd6b10fdce5116f31ab85ec109863368271494b7 Mon Sep 17 00:00:00 2001 From: Nok Lam Chan Date: Wed, 31 May 2023 15:58:28 +0100 Subject: [PATCH 2/2] Update logging to use kedro.logging.RichHandler (#130) Signed-off-by: Nok Chan