chore(deps): bump specklesystems/speckle-automate-github-composite-action (#11)

Bumps [specklesystems/speckle-automate-github-composite-action](https://github.com/specklesystems/speckle-automate-github-composite-action) from 0.7.2 to 0.8.0.
- [Release notes](https://github.com/specklesystems/speckle-automate-github-composite-action/releases)
- [Commits](https://github.com/specklesystems/speckle-automate-github-composite-action/compare/0.7.2...0.8.0)

---
updated-dependencies:
- dependency-name: specklesystems/speckle-automate-github-composite-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.devcontainer/devcontainer.json

@@ -0,0 +1,43 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/python
+{
+  "name": "Python 3",
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  "image": "mcr.microsoft.com/devcontainers/python:1-3.11-bullseye",
+  "features": {
+    "ghcr.io/devcontainers-contrib/features/poetry:2": {}
+  },
+
+  "remoteEnv": {
+    "SPECKLE_TOKEN": "foobar"
+  },
+  "containerEnv": {
+    "SPECKLE_TOKEN": "asdfasdf"
+  },
+
+  // Features to add to the dev container. More info: https://containers.dev/features.
+  // "features": {},
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": "cp .env.example .env && POETRY_VIRTUALENVS_IN_PROJECT=true poetry install --no-root",
+
+  // Configure tool-specific properties.
+  "customizations": {
+    "vscode": {
+      // Add the IDs of extensions you want installed when the container is created.
+      "extensions": [
+        "ms-python.vscode-pylance",
+        "ms-python.python",
+        "ms-python.black-formatter",
+        "streetsidesoftware.code-spell-checker",
+        "mikestead.dotenv"
+      ]
+    }
+  }
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}

.env.example

@@ -0,0 +1 @@
+SPECKLE_TOKEN=mytoken

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/main.yml

@@ -1,24 +1,20 @@
 name: 'build and deploy Speckle functions'
-on: # rebuild any PRs and any branch changes
-  pull_request:
+on:
+  workflow_dispatch:
   push:
-    branches:
-      - main
+    tags:
+      - '*'
 
 jobs:
   publish-automate-function-version: # make sure the action works on a clean machine without building
+    env:
+      FUNCTION_SCHEMA_FILE_NAME: functionSchema.json
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.4.0
-      - uses: actions/checkout@v3.4.0
+      - uses: actions/checkout@v4.1.1
+      - uses: actions/setup-python@v5
         with:
-          repository: 'specklesystems/speckle-automate-github-action'
-          path: 'github-action'
-          ref: main
-
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.11' 
+          python-version: '3.11'
       - name: Install and configure Poetry
         uses: snok/install-poetry@v1
         with:
@@ -29,27 +25,14 @@ jobs:
       - name: Restore dependencies
         run: poetry install --no-root
       - name: Extract functionInputSchema
+        id: extract_schema
         run: |
-          echo "function_input_schema=$(python schema_generation.py)" >> "$GITHUB_ENV"
-      - uses: ./github-action
-        id: function_publish
+          python main.py generate_schema ${HOME}/${{ env.FUNCTION_SCHEMA_FILE_NAME }}
+      - name: Speckle Automate Function - Build and Publish
+        uses: specklesystems/speckle-automate-github-composite-action@0.8.0
         with:
-          speckle_server_url: 'https://automate.speckle.dev'
-          speckle_token: ${{ secrets.SPECKLE_AUTOMATE_FUNCTION_PUBLISH_TOKEN }}
-          speckle_function_id: ${{ secrets.SPECKLE_AUTOMATE_FUNCTION_ID }}
-          speckle_function_input_schema: ${{ env.function_input_schema }}
-          speckle_function_command: 'python main.py'
-          speckle_function_path: '.'
-      - name: Log in to Speckle Automate Docker registry
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
-        with:
-          registry: 'https://automate.speckle.dev'
-          username: ${{ secrets.SPECKLE_AUTOMATE_FUNCTION_PUBLISH_TOKEN }}
-          password: ${{ secrets.SPECKLE_AUTOMATE_FUNCTION_PUBLISH_TOKEN }}
-      - name: Build and push Docker image
-        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: automate.speckle.dev/${{ secrets.SPECKLE_AUTOMATE_FUNCTION_ID }}:${{ steps.function_publish.outputs.version_id }}
+          speckle_automate_url: ${{ env.SPECKLE_AUTOMATE_URL || 'https://automate.speckle.dev' }} 
+          speckle_token: ${{ secrets.SPECKLE_FUNCTION_TOKEN }}
+          speckle_function_id: ${{ secrets.SPECKLE_FUNCTION_ID }}
+          speckle_function_input_schema_file_path: ${{ env.FUNCTION_SCHEMA_FILE_NAME }}
+          speckle_function_command: 'python -u main.py run'

.gitignore

@@ -1,6 +1,13 @@
 # Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,python,pycharm
 # Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,python,pycharm
 
+function_inputs.json
+
+**/.env
+**/.envrc
+
+**/.tool-versions
+
 ### PyCharm ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

.tool-versions

@@ -1 +0,0 @@
-python 3.11.0

.vscode/launch.json

@@ -5,12 +5,14 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "Python: Current File",
+      "name": "Speckle Automate function",
       "type": "python",
       "request": "launch",
-      "program": "${file}",
+      "program": "main.py",
       "console": "integratedTerminal",
-      "justMyCode": false
+      "justMyCode": true,
+      "envFile": "${workspaceFolder}/.env",
+      "args": ["run", "function_inputs.json"]
     }
   ]
-}
+}

.vscode/settings.json

@@ -1,3 +1,9 @@
 {
-  "cSpell.words": ["camelcase", "pydantic", "stringcase", "typer"]
+  "cSpell.words": [
+    "camelcase",
+    "pydantic",
+    "stringcase",
+    "typer"
+  ],
+  "python.defaultInterpreterPath": ".venv/bin/python"
 }

Dockerfile

@@ -1,7 +1,16 @@
+# We use the official Python 3.11 image as our base image and will add our code to it. For more details, see https://hub.docker.com/_/python
 FROM python:3.11-slim
 
+# We install poetry to generate a list of dependencies which will be required by our application
 RUN pip install poetry
 
-COPY . .
-RUN poetry export -f requirements.txt --output requirements.txt && pip install -r requirements.txt
-# RUN poetry install --no-root --no-dev
+# We set the working directory to be the /home/speckle directory; all of our files will be copied here.
+WORKDIR /home/speckle
+
+# Copy all of our code and assets from the local directory into the /home/speckle directory of the container.
+# We also ensure that the user 'speckle' owns these files, so it can access them
+# This assumes that the Dockerfile is in the same directory as the rest of the code
+COPY . /home/speckle
+
+# Using poetry, we generate a list of requirements, save them to requirements.txt, and then use pip to install them
+RUN poetry export --format requirements.txt --output /home/speckle/requirements.txt && pip install --requirement /home/speckle/requirements.txt

LICENSE

@@ -0,0 +1,208 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2020 AEC Systems
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+   
+   NOTICE: Unless otherwise described, the code in this repository is 
+   licensed under the license above. Some modules, extensions or code herein 
+   might be otherwise licensed. This is indicated either in the root of the 
+   containing folder under a different license file, or in the respective 
+   file's header. If you have any questions, don't hesitate to get in touch 
+   with us via [email](mailto:hello@speckle.systems).

README.md

@@ -1 +1,100 @@
-# Go Automate Go
+# Speckle Automate function template - Python
+
+This is a template repository for a Speckle Automate functions written in python
+using the [specklepy](https://pypi.org/project/specklepy/) SDK to interact with Speckle data.
+
+This template contains the full scaffolding required to publish a function to the automate environment.
+Also has some sane defaults for a development environment setups.
+
+## Getting started
+
+1. Use this template repository to create a new repository in your own / organization's profile.
+
+Register the function 
+
+### Add new dependencies
+
+To add new python package dependencies to the project, use:
+`$ poetry add pandas`
+
+### Change launch variables
+
+describe how the launch.json should be edited
+
+### Github Codespaces
+
+Create a new repo from this template, and use the create new code.
+
+### Using this Speckle Function
+
+1. [Create](https://automate.speckle.dev/) a new Speckle Automation.
+1. Select your Speckle Project and Speckle Model.
+1. Select the existing Speckle Function named [`Random comment on IFC beam`](https://automate.speckle.dev/functions/e110be8fad).
+1. Enter a phrase to use in the comment.
+1. Click `Create Automation`.
+
+## Getting Started with creating your own Speckle Function
+
+1. [Register](https://automate.speckle.dev/) your Function with [Speckle Automate](https://automate.speckle.dev/) and select the Python template.
+1. A new repository will be created in your GitHub account.
+1. Make changes to your Function in `main.py`. See below for the Developer Requirements, and instructions on how to test.
+1. To create a new version of your Function, create a new [GitHub release](https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository) in your repository.
+
+## Developer Requirements
+
+1. Install the following:
+    - [Python 3](https://www.python.org/downloads/)
+    - [Poetry](https://python-poetry.org/docs/#installing-with-the-official-installer)
+1. Run `poetry shell && poetry install` to install the required Python packages.
+
+## Building and Testing
+
+The code can be tested locally by running `poetry run pytest`.
+
+### Building and running the Docker Container Image
+
+Running and testing your code on your own machine is a great way to develop your Function; the following instructions are a bit more in-depth and only required if you are having issues with your Function in GitHub Actions or on Speckle Automate.
+
+#### Building the Docker Container Image
+
+Your code is packaged by the GitHub Action into the format required by Speckle Automate. This is done by building a Docker Image, which is then run by Speckle Automate. You can attempt to build the Docker Image yourself to test the building process locally.
+
+To build the Docker Container Image, you will need to have [Docker](https://docs.docker.com/get-docker/) installed.
+
+Once you have Docker running on your local machine:
+
+1. Open a terminal
+1. Navigate to the directory in which you cloned this repository
+1. Run the following command:
+
+    ```bash
+    docker build -f ./Dockerfile -t speckle_automate_python_example .
+    ```
+
+#### Running the Docker Container Image
+
+Once the image has been built by the GitHub Action, it is sent to Speckle Automate. When Speckle Automate runs your Function as part of an Automation, it will run the Docker Container Image. You can test that your Docker Container Image runs correctly by running it locally.
+
+1. To then run the Docker Container Image, run the following command:
+
+    ```bash
+    docker run --rm speckle_automate_python_example \
+    python -u main.py run \
+    '{"projectId": "1234", "modelId": "1234", "branchName": "myBranch", "versionId": "1234", "speckleServerUrl": "https://speckle.xyz", "automationId": "1234", "automationRevisionId": "1234", "automationRunId": "1234", "functionId": "1234", "functionName": "my function", "functionLogo": "base64EncodedPng"}' \
+    '{}' \
+    yourSpeckleServerAuthenticationToken
+    ```
+
+Let's explain this in more detail:
+
+`docker run --rm speckle_automate_python_example` tells Docker to run the Docker Container Image that we built earlier. `speckle_automate_python_example` is the name of the Docker Container Image that we built earlier. The `--rm` flag tells docker to remove the container after it has finished running, this frees up space on your machine.
+
+The line `python -u main.py run` is the command that is run inside the Docker Container Image. The rest of the command is the arguments that are passed to the command. The arguments are:
+
+- `'{"projectId": "1234", "modelId": "1234", "branchName": "myBranch", "versionId": "1234", "speckleServerUrl": "https://speckle.xyz", "automationId": "1234", "automationRevisionId": "1234", "automationRunId": "1234", "functionId": "1234", "functionName": "my function", "functionLogo": "base64EncodedPng"}'` - the metadata that describes the automation and the function.
+- `{}` - the input parameters for the function that the Automation creator is able to set. Here they are blank, but you can add your own parameters to test your function.
+- `yourSpeckleServerAuthenticationToken` - the authentication token for the Speckle Server that the Automation can connect to. This is required to be able to interact with the Speckle Server, for example to get data from the Model.
+
+## Resources
+
+- [Learn](https://speckle.guide/dev/python.html) more about SpecklePy, and interacting with Speckle from Python.

example.function_inputs.json

@@ -0,0 +1,20 @@
+{
+  "speckleToken": "YOUR SPEKCLE TOKEN",
+  "functionInputs": {
+    "whisperMessage": "you are doing something weird",
+    "forbiddenSpeckleType": ""
+  },
+  "automationRunData": {
+    "project_id": "project id",
+    "model_id": "model id",
+    "branch_name": "branch name",
+    "version_id": "version id",
+    "speckle_server_url": "https://latest.speckle.systems",
+    "automation_id": "automation id",
+    "automation_revision_id": "automation revision id",
+    "automation_run_id": "automation run id",
+    "function_id": "function id",
+    "function_name": "function name",
+    "function_logo": null
+  }
+}

flatten.py

@@ -1,9 +1,13 @@
-from typing import Iterable
+"""Helper module for a simple speckle object tree flattening."""
+
+from collections.abc import Iterable
+
 from specklepy.objects import Base
 
 
 def flatten_base(base: Base) -> Iterable[Base]:
+    """Take a base and flatten it to an iterable of bases."""
     if hasattr(base, "elements"):
-        for element in base.elements:
+        for element in base["elements"]:
             yield from flatten_base(element)
-    yield base
+    yield base

main.py

@@ -1,75 +1,103 @@
-import typer
-from pydantic import BaseModel
-from stringcase import camelcase
-from specklepy.transports.memory import MemoryTransport
-from specklepy.transports.server import ServerTransport
-from specklepy.api.operations import receive
-from specklepy.api.client import SpeckleClient
-import random
+"""This module contains the business logic of the function.
+
+Use the automation_context module to wrap your function in an Autamate context helper
+"""
+
+from pydantic import Field, SecretStr
+from speckle_automate import (
+    AutomateBase,
+    AutomationContext,
+    execute_automate_function,
+)
 
 from flatten import flatten_base
-from make_comment import make_comment
 
 
-class SpeckleProjectData(BaseModel):
-    """Values of the project / model that triggered the run of this function."""
+class FunctionInputs(AutomateBase):
+    """These are function author defined values.
 
-    project_id: str
-    model_id: str
-    version_id: str
-    speckle_server_url: str
-
-    class Config:
-        alias_generator = camelcase
-
-
-class FunctionInputs(BaseModel):
-    """
-    These are function author defined values, automate will make sure to supply them.
+    Automate will make sure to supply them matching the types specified here.
+    Please use the pydantic model schema to define your inputs:
+    https://docs.pydantic.dev/latest/usage/models/
     """
 
-    comment_text: str
-
-    class Config:
-        alias_generator = camelcase
-
-
-def main(speckle_project_data: str, function_inputs: str, speckle_token: str):
-    project_data = SpeckleProjectData.parse_raw(speckle_project_data)
-    inputs = FunctionInputs.parse_raw(function_inputs)
-
-    client = SpeckleClient(project_data.speckle_server_url, use_ssl=False)
-    client.authenticate_with_token(speckle_token)
-    commit = client.commit.get(project_data.project_id, project_data.version_id)
-    branch = client.branch.get(project_data.project_id, project_data.model_id, 1)
-
-    memory_transport = MemoryTransport()
-    server_transport = ServerTransport(project_data.project_id, client)
-    base = receive(commit.referencedObject, server_transport, memory_transport)
-
-    random_beam = random.choice(
-        [b for b in flatten_base(base) if b.speckle_type == "IFCBEAM"]
-    )
-
-    make_comment(
-        client,
-        project_data.project_id,
-        branch.id,
-        project_data.version_id,
-        inputs.comment_text,
-        random_beam.id,
-    )
-
-    print(
-        "Ran function with",
-        f"{speckle_project_data} {function_inputs}",
+    # an example how to use secret values
+    whisper_message: SecretStr = Field(title="This is a secret message")
+    forbidden_speckle_type: str = Field(
+        title="Forbidden speckle type",
+        description=(
+            "If a object has the following speckle_type,"
+            " it will be marked with an error."
+        ),
     )
 
 
+def automate_function(
+    automate_context: AutomationContext,
+    function_inputs: FunctionInputs,
+) -> None:
+    """This is an example Speckle Automate function.
+
+    Args:
+        automate_context: A context helper object, that carries relevant information
+            about the runtime context of this function.
+            It gives access to the Speckle project data, that triggered this run.
+            It also has conveniece methods attach result data to the Speckle model.
+        function_inputs: An instance object matching the defined schema.
+    """
+    # the context provides a conveniet way, to receive the triggering version
+    version_root_object = automate_context.receive_version()
+
+    objects_with_forbidden_speckle_type = [
+        b
+        for b in flatten_base(version_root_object)
+        if b.speckle_type == function_inputs.forbidden_speckle_type
+    ]
+    count = len(objects_with_forbidden_speckle_type)
+
+    if count > 0:
+        # this is how a run is marked with a failure cause
+        automate_context.attach_error_to_objects(
+            category="Forbidden speckle_type"
+            " ({function_inputs.forbidden_speckle_type})",
+            object_ids=[o.id for o in objects_with_forbidden_speckle_type if o.id],
+            message="This project should not contain the type: "
+            f"{function_inputs.forbidden_speckle_type}",
+        )
+        automate_context.mark_run_failed(
+            "Automation failed: "
+            f"Found {count} object that have one of the forbidden speckle types: "
+            f"{function_inputs.forbidden_speckle_type}"
+        )
+
+        # set the automation context view, to the original model / version view
+        # to show the offending objects
+        automate_context.set_context_view()
+
+    else:
+        automate_context.mark_run_success("No forbidden types found.")
+
+    # if the function generates file results, this is how it can be
+    # attached to the Speckle project / model
+    # automate_context.store_file_result("./report.pdf")
+
+
+def automate_function_without_inputs(automate_context: AutomationContext) -> None:
+    """A function example without inputs.
+
+    If your function does not need any input variables,
+     besides what the automation context provides,
+     the inputs argument can be omitted.
+    """
+    pass
+
+
+# make sure to call the function with the executor
 if __name__ == "__main__":
-    # main(
-    #     '{"projectId":"bbb3aba8d4", "modelId":"automateTest", "versionId": "d37ee808db", "speckleServerUrl": "http://hyperion:3000" }',
-    #     '{"commentText": "automate made me to do this"}',
-    #     "c3e6536e570a94e5d84590c51b29198b26dce89439",
-    # )
-    typer.run(main)
+    # NOTE: always pass in the automate function by its reference, do not invoke it!
+
+    # pass in the function reference with the inputs schema to the executor
+    execute_automate_function(automate_function, FunctionInputs)
+
+    # if the function has no arguments, the executor can handle it like so
+    # execute_automate_function(automate_function_without_inputs)

make_comment.py

@@ -1,103 +0,0 @@
-from specklepy.api.client import SpeckleClient
-from gql import gql
-
-
-def make_comment(
-    client: SpeckleClient,
-    project_id: str,
-    model_id: str,
-    version_id: str,
-    comment_text: str,
-    selected_object_id: str,
-) -> None:
-    client.httpclient.execute(
-        gql(
-            """
-            mutation createComment($input: CreateCommentInput!) {
-                commentMutations {
-                    create(input: $input) {
-                    id
-                    }
-                }
-            }
-        """
-        ),
-        {
-            "input": {
-                "content": {
-                    "blobIds": [],
-                    "doc": {
-                        "content": [
-                            {
-                                "content": [{"text": comment_text, "type": "text"}],
-                                "type": "paragraph",
-                            }
-                        ],
-                        "type": "doc",
-                    },
-                },
-                "projectId": project_id,
-                "resourceIdString": model_id,
-                "screenshot": None,
-                "viewerState": {
-                    "projectId": project_id,
-                    "resources": {
-                        "request": {
-                            "resourceIdString": f"{model_id}@{version_id}",
-                            "threadFilters": {},
-                        }
-                    },
-                    "sessionId": "fooobarbaz",
-                    "ui": {
-                        "camera": {
-                            "isOrthoProjection": False,
-                            "position": [
-                                -13.959975903859306,
-                                109.21340462426888,
-                                19.00868018548827,
-                            ],
-                            "target": [
-                                -28.304303646087646,
-                                99.69336318969727,
-                                2.3997000455856323,
-                            ],
-                            "zoom": 1,
-                        },
-                        "explodeFactor": 0,
-                        "filters": {
-                            "hiddenObjectIds": [],
-                            "isolatedObjectIds": [selected_object_id],
-                            "propertyFilter": {"isApplied": False, "key": None},
-                            "selectedObjectIds": [selected_object_id],
-                        },
-                        "lightConfig": {
-                            "azimuth": 0.75,
-                            "castShadow": True,
-                            "color": 16777215,
-                            "elevation": 1.33,
-                            "enabled": True,
-                            "indirectLightIntensity": 1.2,
-                            "intensity": 5,
-                            "radius": 0,
-                            "shadowcatcher": True,
-                        },
-                        "sectionBox": None,
-                        "selection": [
-                            -31.355755138199026,
-                            101.06821903317298,
-                            4.250507316347136,
-                        ],
-                        "spotlightUserSessionId": None,
-                        "threads": {
-                            "openThread": {
-                                "isTyping": False,
-                                "newThreadEditor": True,
-                                "threadId": None,
-                            }
-                        },
-                    },
-                    "viewer": {"metadata": {"filteringState": {}}},
-                },
-            }
-        },
-    )

pyproject.toml

@@ -4,20 +4,30 @@ version = "0.1.0"
 description = "Example function for Speckle Automate using specklepy"
 authors = ["Gergő Jedlicska <gergo@jedlicska.com>"]
 readme = "README.md"
-packages = [{include = "src/speckle_automate_py"}]
 
 [tool.poetry.dependencies]
-python = "^3.10"
-specklepy = "^2.14.1"
-typer = "^0.9.0"
-pydantic = "^1.10.8"
-stringcase = "^1.2.0"
+python = "^3.11"
+specklepy = "2.17.16"
 
 [tool.poetry.group.dev.dependencies]
 black = "^23.3.0"
 mypy = "^1.3.0"
 ruff = "^0.0.271"
+pytest = "^7.4.2"
+# specklepy = { path = "../specklepy", develop = true }
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.ruff]
+select = [
+  "E",  # pycodestyle
+  "F",  # pyflakes
+  "UP", # pyupgrade
+  "D",  # pydocstyle
+  "I",  # isort
+]
+
+[tool.ruff.pydocstyle]
+convention = "google"

schema_generation.py

@@ -1,6 +0,0 @@
-import json
-from main import FunctionInputs
-
-
-if __name__ == "__main__":
-    print(json.dumps(FunctionInputs.schema()))

tests/test_function.py

@@ -0,0 +1,158 @@
+"""Run integration tests with a speckle server."""
+import os
+import secrets
+import string
+
+import pytest
+from gql import gql
+from speckle_automate import (
+    AutomationRunData,
+    AutomationStatus,
+    run_function,
+)
+from specklepy.api import operations
+from specklepy.api.client import SpeckleClient
+from specklepy.objects.base import Base
+from specklepy.transports.server import ServerTransport
+
+from main import FunctionInputs, automate_function
+
+
+def crypto_random_string(length: int) -> str:
+    """Generate a semi crypto random string of a given length."""
+    alphabet = string.ascii_letters + string.digits
+    return "".join(secrets.choice(alphabet) for _ in range(length))
+
+
+def register_new_automation(
+    project_id: str,
+    model_id: str,
+    speckle_client: SpeckleClient,
+    automation_id: str,
+    automation_name: str,
+    automation_revision_id: str,
+):
+    """Register a new automation in the speckle server."""
+    query = gql(
+        """
+        mutation CreateAutomation(
+            $projectId: String! 
+            $modelId: String! 
+            $automationName: String!
+            $automationId: String! 
+            $automationRevisionId: String!
+        ) {
+                automationMutations {
+                    create(
+                        input: {
+                            projectId: $projectId
+                            modelId: $modelId
+                            automationName: $automationName 
+                            automationId: $automationId
+                            automationRevisionId: $automationRevisionId
+                        }
+                    )
+                }
+            }
+        """
+    )
+    params = {
+        "projectId": project_id,
+        "modelId": model_id,
+        "automationName": automation_name,
+        "automationId": automation_id,
+        "automationRevisionId": automation_revision_id,
+    }
+    speckle_client.httpclient.execute(query, params)
+
+
+@pytest.fixture()
+def speckle_token() -> str:
+    """Provide a speckle token for the test suite."""
+    env_var = "SPECKLE_TOKEN"
+    token = os.getenv(env_var)
+    if not token:
+        raise ValueError(f"Cannot run tests without a {env_var} environment variable")
+    return token
+
+
+@pytest.fixture()
+def speckle_server_url() -> str:
+    """Provide a speckle server url for the test suite, default to localhost."""
+    return os.getenv("SPECKLE_SERVER_URL", "http://127.0.0.1:3000")
+
+
+@pytest.fixture()
+def test_client(speckle_server_url: str, speckle_token: str) -> SpeckleClient:
+    """Initialize a SpeckleClient for testing."""
+    test_client = SpeckleClient(
+        speckle_server_url, speckle_server_url.startswith("https")
+    )
+    test_client.authenticate_with_token(speckle_token)
+    return test_client
+
+
+@pytest.fixture()
+def test_object() -> Base:
+    """Create a Base model for testing."""
+    root_object = Base()
+    root_object.foo = "bar"
+    return root_object
+
+
+@pytest.fixture()
+def automation_run_data(
+    test_object: Base, test_client: SpeckleClient, speckle_server_url: str
+) -> AutomationRunData:
+    """Set up an automation context for testing."""
+    project_id = test_client.stream.create("Automate function e2e test")
+    branch_name = "main"
+
+    model = test_client.branch.get(project_id, branch_name, commits_limit=1)
+    model_id: str = model.id
+
+    root_obj_id = operations.send(
+        test_object, [ServerTransport(project_id, test_client)]
+    )
+    version_id = test_client.commit.create(project_id, root_obj_id)
+
+    automation_name = crypto_random_string(10)
+    automation_id = crypto_random_string(10)
+    automation_revision_id = crypto_random_string(10)
+
+    register_new_automation(
+        project_id,
+        model_id,
+        test_client,
+        automation_id,
+        automation_name,
+        automation_revision_id,
+    )
+
+    automation_run_id = crypto_random_string(10)
+    function_id = crypto_random_string(10)
+    function_revision = crypto_random_string(10)
+    return AutomationRunData(
+        project_id=project_id,
+        model_id=model_id,
+        branch_name=branch_name,
+        version_id=version_id,
+        speckle_server_url=speckle_server_url,
+        automation_id=automation_id,
+        automation_revision_id=automation_revision_id,
+        automation_run_id=automation_run_id,
+        function_id=function_id,
+        function_revision=function_revision,
+    )
+
+
+def test_function_run(automation_run_data: AutomationRunData, speckle_token: str):
+    """Run an integration test for the automate function."""
+    automate_sdk = run_function(
+        automate_function,
+        automation_run_data,
+        speckle_token,
+        FunctionInputs(forbidden_speckle_type="Base"),
+    )
+
+    assert automate_sdk.run_status == AutomationStatus.FAILED