Fix/update lint rules

.github/workflows/linter.yml

@@ -24,4 +24,4 @@ jobs:
         pip install ruff
     - name: Running Ruff Check
       run: |
-        ruff check $(git ls-files '*.py')
+        ruff check

data/ccai_service_kit/conf_score_cfx/main.py

@@ -16,6 +16,7 @@
 
 import json
 import logging
+
 from dfcx_scrapi.tools.webhook_util import WebhookUtil
 
 # logging config

data/get_weather_tool.py

@@ -1,12 +1,12 @@
 """Sample Tool for Agent Builder."""
 import logging
+
 import requests
-from google.auth import default as google_default_auth
-from google.auth.transport.requests import Request as GoogleRequest
-from flask import Flask, request
 from firebase_admin import initialize_app
 from firebase_functions import https_fn
-
+from flask import Flask, request
+from google.auth import default as google_default_auth
+from google.auth.transport.requests import Request as GoogleRequest
 
 initialize_app()
 app = Flask(__name__)

examples/bot_building_series/bot_building_101.py

@@ -14,15 +14,17 @@
 # limitations under the License.
 
 import sys
+
 import pandas as pd
 
 from dfcx_scrapi.core.agents import Agents
-from dfcx_scrapi.core.intents import Intents
 from dfcx_scrapi.core.flows import Flows
+from dfcx_scrapi.core.intents import Intents
 from dfcx_scrapi.core.pages import Pages
 from dfcx_scrapi.tools.dataframe_functions import DataframeFunctions
 from dfcx_scrapi.tools.maker_util import MakerUtil
 
+
 def build_agent(creds_path, project_id):
     """Build a simple agent."""
 

examples/bot_building_series/bot_building_102_intents_with_annotated_tp.py

@@ -17,7 +17,9 @@
 # limitations under the License.
 
 import sys
+
 import pandas as pd
+
 from dfcx_scrapi.core.agents import Agents
 from dfcx_scrapi.tools.dataframe_functions import DataframeFunctions
 
@@ -40,18 +42,18 @@ def build_agent(creds_path, project_id, gcp_region, display_name):
     # Next, we will set some variables for our agent creation or retrieval args
 
     # Then we will call the `create_agent` and capture the result in a var call
-	# `my_agent`
+    # `my_agent`
     my_agent = agent_instance.create_agent(project_id, display_name, gcp_region)
 
     # Option 2: If agent already exists
     # The agent ID must be entered as a string
     # "projects/<PROJECT_ID>/locations/<GCP_REGION>/agents/<AGENT_ID>"
     # my_agent = a.get_agent(
-	#   "projects/<PROJECT_ID>/locations/<GCP_REGION>/agents/<AGENT_ID>")
+    # "projects/<PROJECT_ID>/locations/<GCP_REGION>/agents/<AGENT_ID>")
 
     # ## Create Your First Intent
     # For this demo agent, we'll build a basic intent from list of Training
-	# Phrases (TPs)
+    # Phrases (TPs)
 
     # To simplify the Intent creation, we'll utilize the `DataframeFunctions`
     # class from the `tools` portion of the SCRAPI library.

pyproject.toml

@@ -4,7 +4,16 @@ build-backend = "setuptools.build_meta"
 
 [tool.ruff]
 line-length = 80
-extend-exclude = ["*.ipynb"]
+extend-exclude = ["tests", "*.ipynb"]
+
+[tool.ruff.lint]
+select = [
+    "E", # pycodestyle
+    "F", # Pyflakes
+    "I", # isort
+    "W"  # warn
+    ]
+ignore = []
 
 [tool.ruff.format]
 quote-style = "double"

setup.py

@@ -15,7 +15,8 @@
 # limitations under the License.
 
 import pathlib
-from setuptools import setup, find_packages
+
+from setuptools import find_packages, setup
 
 here = pathlib.Path(__file__).parent.resolve()
 

src/agent_assist/agent_assist.py

@@ -15,14 +15,16 @@
 # limitations under the License.
 
 import logging
-
-from dfcx_scrapi.core import scrapi_base
 from typing import Dict
-from google.cloud.dialogflow_v2beta1 import services
-from google.cloud.dialogflow_v2beta1 import types
-from google.cloud.dialogflow_v2beta1.services.knowledge_bases import KnowledgeBasesClient
+
+from google.cloud.dialogflow_v2beta1 import services, types
+from google.cloud.dialogflow_v2beta1.services.knowledge_bases import (
+    KnowledgeBasesClient,
+)
 from google.protobuf import field_mask_pb2
 
+from dfcx_scrapi.core import scrapi_base
+
 # logging config
 logging.basicConfig(
     level=logging.INFO,
@@ -169,7 +171,7 @@ def create_conversation_profile(
         query_config.max_results = max_results
         feature_config.query_config = query_config
 
-        conversation_profile.human_agent_assistant_config.human_agent_suggestion_config.feature_configs = [feature_config] # pylint: disable=C0301
+        conversation_profile.human_agent_assistant_config.human_agent_suggestion_config.feature_configs = [feature_config] # noqa: E501
 
         request = types.conversation_profile.CreateConversationProfileRequest(
                     parent= project_path,

src/dfcx_scrapi/agent_extract/agents.py

@@ -15,22 +15,22 @@
 # limitations under the License.
 
 import logging
-import time
 import os
 import shutil
+import time
 from typing import Dict
 
-from dfcx_scrapi.core import agents
-from dfcx_scrapi.core import operations
-from dfcx_scrapi.core import scrapi_base
-from dfcx_scrapi.agent_extract import graph
-from dfcx_scrapi.agent_extract import flows
-from dfcx_scrapi.agent_extract import intents
-from dfcx_scrapi.agent_extract import entity_types
-from dfcx_scrapi.agent_extract import test_cases
-from dfcx_scrapi.agent_extract import webhooks
-from dfcx_scrapi.agent_extract import gcs_utils
-from dfcx_scrapi.agent_extract import types
+from dfcx_scrapi.agent_extract import (
+    entity_types,
+    flows,
+    gcs_utils,
+    graph,
+    intents,
+    test_cases,
+    types,
+    webhooks,
+)
+from dfcx_scrapi.core import agents, operations, scrapi_base
 
 # logging config
 logging.basicConfig(

src/dfcx_scrapi/agent_extract/common.py

@@ -16,6 +16,7 @@
 
 import logging
 import re
+
 from dfcx_scrapi.agent_extract import types
 
 # logging config

src/dfcx_scrapi/agent_extract/entity_types.py

@@ -16,11 +16,10 @@
 
 import json
 import os
-
 from typing import Dict
 
-from dfcx_scrapi.agent_extract import common
-from dfcx_scrapi.agent_extract import types
+from dfcx_scrapi.agent_extract import common, types
+
 
 class EntityTypes:
     """Entity Type processing methods and functions."""

src/dfcx_scrapi/agent_extract/flows.py

@@ -16,15 +16,16 @@
 
 import json
 import os
-
 from typing import List
 
-from dfcx_scrapi.agent_extract import graph
-from dfcx_scrapi.agent_extract import common
-from dfcx_scrapi.agent_extract import types
-from dfcx_scrapi.agent_extract import pages
-from dfcx_scrapi.agent_extract import routes
-from dfcx_scrapi.agent_extract import route_groups
+from dfcx_scrapi.agent_extract import (
+    common,
+    graph,
+    pages,
+    route_groups,
+    routes,
+    types,
+)
 
 
 class Flows:

src/dfcx_scrapi/agent_extract/gcs_utils.py

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 import zipfile
+
 from google.cloud import storage
 from google.oauth2 import service_account
 

src/dfcx_scrapi/agent_extract/graph.py

@@ -16,6 +16,7 @@
 
 import collections
 
+
 class Graph:
     """Utility class for manaing graph structure."""
 

src/dfcx_scrapi/agent_extract/intents.py

@@ -17,8 +17,7 @@
 import json
 import os
 
-from dfcx_scrapi.agent_extract import common
-from dfcx_scrapi.agent_extract import types
+from dfcx_scrapi.agent_extract import common, types
 
 
 class Intents:

src/dfcx_scrapi/agent_extract/pages.py

@@ -16,12 +16,9 @@
 
 import json
 import os
+from typing import Any, Dict
 
-from typing import Dict, Any
-
-from dfcx_scrapi.agent_extract import common
-from dfcx_scrapi.agent_extract import types
-from dfcx_scrapi.agent_extract import routes
+from dfcx_scrapi.agent_extract import common, routes, types
 
 
 class Pages:

src/dfcx_scrapi/agent_extract/route_groups.py

@@ -14,12 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import json
+import os
 
-from dfcx_scrapi.agent_extract import common
-from dfcx_scrapi.agent_extract import types
-from dfcx_scrapi.agent_extract import routes
+from dfcx_scrapi.agent_extract import common, routes, types
 
 
 class RouteGroups:

src/dfcx_scrapi/agent_extract/routes.py

@@ -14,10 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Dict, Any
+from typing import Any, Dict
 
-from dfcx_scrapi.agent_extract import common
-from dfcx_scrapi.agent_extract import types
+from dfcx_scrapi.agent_extract import common, types
 
 
 class Fulfillments:

src/dfcx_scrapi/agent_extract/test_cases.py

@@ -16,11 +16,9 @@
 
 import json
 import os
+from typing import Any, Dict, List
 
-from typing import Dict, List, Any
-
-from dfcx_scrapi.agent_extract import common
-from dfcx_scrapi.agent_extract import types
+from dfcx_scrapi.agent_extract import common, types
 
 
 class TestCases:

src/dfcx_scrapi/agent_extract/types.py

@@ -14,11 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from typing import Dict, List, Any, Tuple
 from dataclasses import dataclass, field
+from typing import Any, Dict, List, Tuple
 
 from dfcx_scrapi.agent_extract import graph as graph_class
 
+
 @dataclass
 class AgentMetadata:
     """Used to track the current Agent Metadata attrinbutes."""

src/dfcx_scrapi/agent_extract/webhooks.py

@@ -17,8 +17,8 @@
 import json
 import os
 
-from dfcx_scrapi.agent_extract import common
-from dfcx_scrapi.agent_extract import types
+from dfcx_scrapi.agent_extract import common, types
+
 
 class Webhooks:
     """Webhook linter methods and functions."""

src/dfcx_scrapi/builders/agents.py

@@ -17,8 +17,8 @@
 import logging
 from typing import List
 
-from google.cloud.dialogflowcx_v3beta1.types import Agent
-from google.cloud.dialogflowcx_v3beta1.types import SpeechToTextSettings
+from google.cloud.dialogflowcx_v3beta1.types import Agent, SpeechToTextSettings
+
 from dfcx_scrapi.builders.builders_common import BuildersCommon
 
 # logging config

src/dfcx_scrapi/builders/builders_common.py

@@ -17,8 +17,10 @@
 import logging
 from typing import List, Union
 
-from google.cloud.dialogflowcx_v3beta1.types import TransitionRoute
-from google.cloud.dialogflowcx_v3beta1.types import EventHandler
+from google.cloud.dialogflowcx_v3beta1.types import (
+    EventHandler,
+    TransitionRoute,
+)
 
 # logging config
 logging.basicConfig(

src/dfcx_scrapi/builders/entity_types.py

@@ -18,6 +18,7 @@
 from typing import List, Union
 
 from google.cloud.dialogflowcx_v3beta1.types import EntityType
+
 from dfcx_scrapi.builders.builders_common import BuildersCommon
 
 # logging config

src/dfcx_scrapi/builders/flows.py

@@ -18,14 +18,19 @@
 from dataclasses import dataclass
 from typing import List, Union
 
-from google.cloud.dialogflowcx_v3beta1.types import Flow
-from google.cloud.dialogflowcx_v3beta1.types import NluSettings
-from google.cloud.dialogflowcx_v3beta1.types import TransitionRoute
-from google.cloud.dialogflowcx_v3beta1.types import EventHandler
+from google.cloud.dialogflowcx_v3beta1.types import (
+    EventHandler,
+    Flow,
+    NluSettings,
+    TransitionRoute,
+)
+
 from dfcx_scrapi.builders.builders_common import BuildersCommon
-from dfcx_scrapi.builders.routes import TransitionRouteBuilder
-from dfcx_scrapi.builders.routes import EventHandlerBuilder
 from dfcx_scrapi.builders.fulfillments import FulfillmentBuilder
+from dfcx_scrapi.builders.routes import (
+    EventHandlerBuilder,
+    TransitionRouteBuilder,
+)
 
 # logging config
 logging.basicConfig(