Skip to content
This repository has been archived by the owner on Jul 6, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
feat: filter is used to filter conversations used for issue model tra…
…ining feat: update_time is used to indicate when the phrase matcher was updated (#48)
  • Loading branch information
gcf-owl-bot[bot] committed Sep 20, 2021
1 parent 335cc97 commit 92b9f30
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 27 deletions.
16 changes: 14 additions & 2 deletions google/cloud/contact_center_insights_v1/types/resources.py
Expand Up @@ -737,15 +737,21 @@ class InputDataConfig(proto.Message):
r"""Configs for the input data used to create the issue model.
Attributes:
medium (google.cloud.contact_center_insights_v1.types.Conversation.Medium):
Required. Medium of conversations used in
training data.
Medium of conversations used in training data. This field is
being deprecated. To specify the medium to be used in
training a new issue model, set the ``medium`` field on
``filter``.
training_conversations_count (int):
Output only. Number of conversations used in
training. Output only.
filter (str):
A filter to reduce the conversations used for
training the model to a specific subset.
"""

medium = proto.Field(proto.ENUM, number=1, enum="Conversation.Medium",)
training_conversations_count = proto.Field(proto.INT64, number=2,)
filter = proto.Field(proto.STRING, number=3,)

name = proto.Field(proto.STRING, number=1,)
display_name = proto.Field(proto.STRING, number=2,)
Expand Down Expand Up @@ -857,6 +863,9 @@ class PhraseMatcher(proto.Message):
The role whose utterances the phrase matcher should be
matched against. If the role is ROLE_UNSPECIFIED it will be
matched against any utterances in the transcript.
update_time (google.protobuf.timestamp_pb2.Timestamp):
Output only. The most recent time at which
the phrase matcher was updated.
"""

class PhraseMatcherType(proto.Enum):
Expand Down Expand Up @@ -885,6 +894,9 @@ class PhraseMatcherType(proto.Enum):
role_match = proto.Field(
proto.ENUM, number=10, enum="ConversationParticipant.Role",
)
update_time = proto.Field(
proto.MESSAGE, number=11, message=timestamp_pb2.Timestamp,
)


class PhraseMatchRuleGroup(proto.Message):
Expand Down
44 changes: 19 additions & 25 deletions samples/snippets/noxfile.py
Expand Up @@ -39,29 +39,31 @@

TEST_CONFIG = {
# You can opt out from the test for specific Python versions.
"ignored_versions": [],
'ignored_versions': [],

# Old samples are opted out of enforcing Python type hints
# All new samples should feature them
"enforce_type_hints": False,
'enforce_type_hints': False,

# An envvar key for determining the project id to use. Change it
# to 'BUILD_SPECIFIC_GCLOUD_PROJECT' if you want to opt in using a
# build specific Cloud project. You can also use your own string
# to use your own Cloud project.
"gcloud_project_env": "GOOGLE_CLOUD_PROJECT",
'gcloud_project_env': 'GOOGLE_CLOUD_PROJECT',
# 'gcloud_project_env': 'BUILD_SPECIFIC_GCLOUD_PROJECT',
# If you need to use a specific version of pip,
# change pip_version_override to the string representation
# of the version number, for example, "20.2.4"
"pip_version_override": None,
# A dictionary you want to inject into your test. Don't put any
# secrets here. These values will override predefined values.
"envs": {},
'envs': {},
}


try:
# Ensure we can import noxfile_config in the project's directory.
sys.path.append(".")
sys.path.append('.')
from noxfile_config import TEST_CONFIG_OVERRIDE
except ImportError as e:
print("No user noxfile_config found: detail: {}".format(e))
Expand All @@ -76,12 +78,12 @@ def get_pytest_env_vars() -> Dict[str, str]:
ret = {}

# Override the GCLOUD_PROJECT and the alias.
env_key = TEST_CONFIG["gcloud_project_env"]
env_key = TEST_CONFIG['gcloud_project_env']
# This should error out if not set.
ret["GOOGLE_CLOUD_PROJECT"] = os.environ[env_key]
ret['GOOGLE_CLOUD_PROJECT'] = os.environ[env_key]

# Apply user supplied envs.
ret.update(TEST_CONFIG["envs"])
ret.update(TEST_CONFIG['envs'])
return ret


Expand All @@ -90,14 +92,11 @@ def get_pytest_env_vars() -> Dict[str, str]:
ALL_VERSIONS = ["3.6", "3.7", "3.8", "3.9"]

# Any default versions that should be ignored.
IGNORED_VERSIONS = TEST_CONFIG["ignored_versions"]
IGNORED_VERSIONS = TEST_CONFIG['ignored_versions']

TESTED_VERSIONS = sorted([v for v in ALL_VERSIONS if v not in IGNORED_VERSIONS])

INSTALL_LIBRARY_FROM_SOURCE = os.environ.get("INSTALL_LIBRARY_FROM_SOURCE", False) in (
"True",
"true",
)
INSTALL_LIBRARY_FROM_SOURCE = os.environ.get("INSTALL_LIBRARY_FROM_SOURCE", False) in ("True", "true")
#
# Style Checks
#
Expand Down Expand Up @@ -142,7 +141,7 @@ def _determine_local_import_names(start_dir: str) -> List[str]:

@nox.session
def lint(session: nox.sessions.Session) -> None:
if not TEST_CONFIG["enforce_type_hints"]:
if not TEST_CONFIG['enforce_type_hints']:
session.install("flake8", "flake8-import-order")
else:
session.install("flake8", "flake8-import-order", "flake8-annotations")
Expand All @@ -151,11 +150,9 @@ def lint(session: nox.sessions.Session) -> None:
args = FLAKE8_COMMON_ARGS + [
"--application-import-names",
",".join(local_names),
".",
"."
]
session.run("flake8", *args)


#
# Black
#
Expand All @@ -168,7 +165,6 @@ def blacken(session: nox.sessions.Session) -> None:

session.run("black", *python_files)


#
# Sample Tests
#
Expand All @@ -177,9 +173,7 @@ def blacken(session: nox.sessions.Session) -> None:
PYTEST_COMMON_ARGS = ["--junitxml=sponge_log.xml"]


def _session_tests(
session: nox.sessions.Session, post_install: Callable = None
) -> None:
def _session_tests(session: nox.sessions.Session, post_install: Callable = None) -> None:
if TEST_CONFIG["pip_version_override"]:
pip_version = TEST_CONFIG["pip_version_override"]
session.install(f"pip=={pip_version}")
Expand Down Expand Up @@ -209,7 +203,7 @@ def _session_tests(
# on travis where slow and flaky tests are excluded.
# See http://doc.pytest.org/en/latest/_modules/_pytest/main.html
success_codes=[0, 5],
env=get_pytest_env_vars(),
env=get_pytest_env_vars()
)


Expand All @@ -219,9 +213,9 @@ def py(session: nox.sessions.Session) -> None:
if session.python in TESTED_VERSIONS:
_session_tests(session)
else:
session.skip(
"SKIPPED: {} tests are disabled for this sample.".format(session.python)
)
session.skip("SKIPPED: {} tests are disabled for this sample.".format(
session.python
))


#
Expand Down

0 comments on commit 92b9f30

Please sign in to comment.