Merge branch 'release/1.2.0' into main

# Conflicts:
#	README.md
#	pyttman/version.py

Author: dotchetter

CHANGELOG.md

@@ -2,9 +2,37 @@
 
 
 
+# v 1.1.12
+**2022-04-10**
+
+This mini-release contains small changes and bug fixes.
+
+### :star2: News
+* **Improved behavior control when using the EntityParser Api**
+
+  Added the option for developers to state explicitly whether they want to ignore or keep any strings in 'lead' and/or 'trail' from the Intent, as possible strings
+in the EntityParser.
+### 👀 Changes
+
+* **Internal cleaning and refactoring of our Parser code.**
+
+  Removed redundant class `AbstractParserBase`, making the `Parser` class 
+  the base parser class in Pyttman. 
+
+
+* **BoolEntityField now defaults to `False`**
+
+  The `BoolEntityField` class defaults to `False` if it can't find the 
+  sought value in a message, in comparison to the previous default `None` 
+  as default value.  
+
+### **🐛 Splatted bugs and corrected issues** 
+* **Fixes [#63](https://github.com/dotchetter/Pyttman/issues/63)**
+  
+  
 
 # v 1.1.11
-**2022-**
+**2022-04-7**
 
 This release improves the **EntityParser** API, packs the new `create 
 ability` command for the `pyttman` cli tool, and introduces a 
@@ -106,8 +134,8 @@ few new other features and bugfixes.
 * 
 
 ### **🐛 Splatted bugs and corrected issues** 
-* **Fixes [#58]((https://github.com/dotchetter/Pyttman/issues/58)**
-* **Fixes [#62]((https://github.com/dotchetter/Pyttman/issues/58)**
+* **Fixes [#58](https://github.com/dotchetter/Pyttman/issues/58)**
+* **Fixes [#62](https://github.com/dotchetter/Pyttman/issues/62)**
 
 
 

README.md

@@ -153,8 +153,7 @@ pyttman shell my_first_app
 pyttman runclient my_first_app
 ```
 
-## Find content in messages 
-
+## Discord support built in - No extra code to get your chatbot online
 
 **Pyttman aims to offer developers a platform-independent experience.** 
 We're constantly developing support for more platforms. As of today, Pyttman offers built-in support for Discord through the [discord.py](https://github.com/Rapptz/discord.py) library, and we have more on the way. 

devtools/__init__.py

@@ -0,0 +1,9 @@
+"""
+This module contains tools for developers contributing to Pyttman.
+
+It helps with building the framework for testing and simplifies
+deployment, and makes it easier to verify functionality of tools such
+as Pyttman CLI and testing the framework using a local-only test-app
+with the most recent build of the framework.
+"""
+

devtools/build.py

@@ -0,0 +1,16 @@
+import os
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+
+# Set the current working dir to parent directory
+sys.path.append(Path.cwd().parent.as_posix())
+os.chdir("..")
+CATALOGS = ("build", "dist")
+
+BUILD_CMD = "python -m setup sdist bdist_wheel".split()
+
+if __name__ == "__main__":
+    [shutil.rmtree(i) for i in CATALOGS]
+    subprocess.run(BUILD_CMD)

devtools/create_environment.py

@@ -0,0 +1,43 @@
+# Set the current working dir to parent directory
+import os
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+from time import sleep
+
+sys.path.append(Path.cwd().parent.as_posix())
+os.chdir("..")
+
+LAB_ENV_PATH = Path.cwd() / Path("dev_env")
+BUILD_OUTPUT_PATH = Path.cwd() / "dist"
+
+if __name__ == "__main__":
+    if (LAB_ENV_PATH / "venv").exists():
+        shutil.rmtree((LAB_ENV_PATH / "venv").as_posix())
+
+    if not Path("dist").exists():
+        print("\nCannot create local testing environment as there is no "
+              "build generated for the current local version of Pyttman.",
+              "Run 'build.py' to create one.")
+        exit(-1)
+
+    LAB_ENV_PATH.mkdir(exist_ok=True)
+    os.chdir(LAB_ENV_PATH.as_posix())
+    subprocess.run("python -m virtualenv venv".split())
+
+    while not Path("venv").exists():
+        sleep(0.01)
+
+    package_file = [
+        i for i in os.listdir(BUILD_OUTPUT_PATH.as_posix()) if i.endswith("tar.gz")
+    ].pop()
+
+    print(f"Installing package: '{package_file}' from your local build...")
+    package_file = (BUILD_OUTPUT_PATH / package_file).as_posix()
+    venv_python = (LAB_ENV_PATH / "venv/scripts/python.exe").as_posix()
+    subprocess.run(f"{venv_python} -m pip install multidict".split())
+    subprocess.run(f"{venv_python} -m pip install {package_file}".split())
+
+    print("\nFinished! You can now create an app and start testing in "
+          f"{LAB_ENV_PATH.as_posix()}.")

pyttman/__init__.py

@@ -4,7 +4,7 @@
 
 __version__ = version.__version__
 __author__ = "Simon Olofsson"
-__copyright__ = "(c) Pyttman development Team 2020-2021"
+__copyright__ = "(c) Pyttman development Team 2020-2022"
 __licence__ = "MIT"
 
 

pyttman/clients/builtin/cli.py

@@ -31,7 +31,7 @@ def run_client(self):
                 elif isinstance(reply, Reply):
                     print(f"{pyttman.settings.APP_NAME}:", reply.as_str())
                 print()
-        except KeyboardInterrupt:
+        except (KeyboardInterrupt, EOFError):
             sys.exit(0)
 
     @staticmethod

pyttman/core/ability.py

@@ -68,15 +68,6 @@ def __validate_intents(self):
                         "Ability class.\nHint: Change '(FooIntent(), "
                         "BarIntent())' to '(FooIntent, BarIntent).")
 
-                # Validate the EntityParser by calling constructor
-                if intent_class.EntityParser is not None:
-                    try:
-                        intent_class().EntityParser()
-                    except Exception as e:
-                        raise AttributeError(
-                            "An error occurred with the EntityParser "
-                            f"in Intent class '{intent_class}': {e}")
-
     def before_create(self):
         """
         Lifecycle hook. This hook method is executed before the

pyttman/core/containers.py

@@ -19,7 +19,7 @@ class MessageMixin(PrettyReprMixin):
     inheritance when a Message-like class is developed
     for supporting a 3rd party library / API.
     """
-    __repr_fields__ = ("created", "content")
+    __repr_fields__ = ("author", "created")
 
     def __init__(self, content=None, **kwargs):
         self.author = "anonymous"

pyttman/core/entity_parsing/fields.py

@@ -21,12 +21,14 @@ class EntityFieldBase(EntityFieldValueParser, ABC):
     datatype if a match is True.
 
     """
+    default = None
     type_cls = None
     identifier_cls = None
 
     def __init__(self,
                  identifier: Type[Identifier] | None = None,
                  as_list: bool = False,
+                 default: Any = None,
                  **kwargs):
         """
         :param as_list: If set to True combined with providing 'valid_strings',
@@ -52,12 +54,11 @@ def __init__(self,
                                                 f"a valid value for "
                                                 f"'type_cls'.")
 
-        identifier_cls = self.identifier_cls
         self.as_list = as_list
-        if identifier is not None:
-            identifier_cls = identifier
+        _default_arg = default if default is not None else self.default
 
-        super().__init__(identifier=identifier_cls, **kwargs)
+        super().__init__(identifier=identifier or self.identifier_cls,
+                         default=_default_arg, **kwargs)
 
     def convert_value(self, value: Any) -> Any:
         """
@@ -150,6 +151,7 @@ class BoolEntityField(EntityFieldBase):
     The value output from this EntityField is <int>.
     """
     type_cls = bool
+    default = False
     truncates_message_in_parsing = False
 
     def __init__(self, *args,