Skip to content

Commit

Permalink
Miscellaneous Doc updates (#510)
Browse files Browse the repository at this point in the history
<!--  Thanks for sending a pull request!  Here are some tips for you:

1. Run unit tests and ensure that they are passing
2. If your change introduces any API changes, make sure to update the
e2e tests
3. Make sure documentation is updated for your PR!

-->

**What this PR does / why we need it**:
<!-- Explain here the context and why you're making the change. What is
the problem you're trying to solve. --->

This PR implements a few small changes:
1. `.github/release.yml` - Adds a configuration for categorising changes
in automatically generated release notes
([ref](https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#example-configurations))
2. `.github/workflows/pr-checks.yaml` - Makes labelling PRs mandatory
([ref](https://github.com/marketplace/actions/require-labels)). The full
list of labels are [here](https://github.com/caraml-dev/merlin/labels).
Only a subset of them, defined in the workflow file, are applicable to
PRs.
3. Renames / reorganises the docs:
```
.
├── README.md
├── SUMMARY.md
├── developer // For dev docs
├── diagrams
├── images
├── maintainer // For maintainer docs
└── user // For user docs
```
4. Update the PR template to make the comments slightly more concise and
add more sections

The contents of the docs will be updated in a separate PR.

**Which issue(s) this PR fixes**:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->

None

**Does this PR introduce a user-facing change?**:
<!--
If no, just write "NONE" in the release-note block below.
If yes, a release note is required. Enter your extended release note in
the block below.
If the PR requires additional action from users switching to the new
release, include the string "action required".

For more information about release notes, see kubernetes' guide here:
http://git.k8s.io/community/contributors/guide/release-notes.md
-->

```release-note
NONE
```

**Checklist**

- [ ] Added unit test, integration, and/or e2e tests
- [ ] Tested locally
- [x] Updated documentation
- [ ] Update Swagger spec if the PR introduce API changes
- [ ] Regenerated Golang and Python client if the PR introduce API
changes
  • Loading branch information
krithika369 authored Dec 21, 2023
1 parent f168838 commit fe2e7c5
Show file tree
Hide file tree
Showing 39 changed files with 90 additions and 58 deletions.
33 changes: 17 additions & 16 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,29 @@
3. Make sure documentation is updated for your PR!
-->
# Description
<!-- Briefly describe the motivation for the change. Please include illustrations where appropriate. -->

**What this PR does / why we need it**:
<!-- Explain here the context and why you're making the change. What is the problem you're trying to solve. --->
# Modifications
<!-- Summarize the key code changes. -->

**Which issue(s) this PR fixes**:
<!--
*Automatically closes linked issue when PR is merged.
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
# Tests
<!-- Besides the existing / updated automated tests, what specific scenarios should be tested? Consider the backward compatibility of the changes, whether corner cases are covered, etc. Please describe the tests and check the ones that have been completed. Eg:
- [x] Deploying new and existing standard models
- [ ] Deploying PyFunc models
-->

Fixes #
# Checklist
- [ ] Added PR label
- [ ] Added unit test, integration, and/or e2e tests
- [ ] Tested locally
- [ ] Updated documentation
- [ ] Update Swagger spec if the PR introduce API changes
- [ ] Regenerated Golang and Python client if the PR introduces API changes

**Does this PR introduce a user-facing change?**:
# Release Notes
<!--
Does this PR introduce a user-facing change?
If no, just write "NONE" in the release-note block below.
If yes, a release note is required. Enter your extended release note in the block below.
If the PR requires additional action from users switching to the new release, include the string "action required".
Expand All @@ -29,11 +38,3 @@ For more information about release notes, see kubernetes' guide here: http://git
```release-note
```

**Checklist**

- [ ] Added unit test, integration, and/or e2e tests
- [ ] Tested locally
- [ ] Updated documentation
- [ ] Update Swagger spec if the PR introduce API changes
- [ ] Regenerated Golang and Python client if the PR introduce API changes
18 changes: 18 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
changelog:
exclude:
labels:
- ignore-for-release
categories:
- title: Breaking Changes 🛠
labels:
- breaking
- title: New Features 🎉
labels:
- enhancement
- title: Bug Fixes 🐞
- bug
- title: Documentation 📄
- documentation
- title: Other Changes
labels:
- "*"
16 changes: 16 additions & 0 deletions .github/workflows/pr-checks.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Pull Request Labels
on:
pull_request:
types: [opened, labeled, unlabeled, synchronize]
jobs:
label:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: mheap/github-action-required-labels@v5
with:
mode: minimum
count: 1
labels: "breaking, bug, enhancement, documentation, maintenance" # Permissible PR labels
11 changes: 11 additions & 0 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,14 @@ The design of Merlin uses a few key concepts below, you should familiarize yours
**Model Version Endpoint**: A model version endpoint is a way to obtain model inference results in real-time, over the network (HTTP). This endpoint is unique to each model version. Model endpoint will route to the model version endpoint in the background, when the associated model version is set to serving.

**Environment**: The environment’s name is a user-facing property that will be used to determine the target Kubernetes cluster where a model will be deployed to. The environment has two important properties, name and Kubernetes cluster.

## Getting Started

To start learning about using Merlin, check out:
{% page-ref page="../user/basics.md" %}

To connect to an existing Merlin deployment, check out:
{% page-ref page="../user/connecting-to-merlin/README.md" %}

To start deploying Merlin, check out:
{% page-ref page="../developer/deploying-merlin/README.md" %}
53 changes: 26 additions & 27 deletions docs/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,41 @@
## Introduction

* [Merlin Overview](README.md)
* [Getting Started](getting-started/README.md)

## Connecting to Merlin

* [Connection Methods](connecting-to-merlin/README.md)
* [Python SDK](connecting-to-merlin/python-sdk.md)
* [Merlin CLI](connecting-to-merlin/merlin-cli.md)
* [Connection Methods](user/connecting-to-merlin/README.md)
* [Python SDK](user/connecting-to-merlin/python-sdk.md)
* [Merlin CLI](user/connecting-to-merlin/merlin-cli.md)

## User Guides

* [Basic Concepts](user-guide/basics.md)
* [Create a Model](user-guide/model.md)
* [Create a Model Version](user-guide/model_version.md)
* [Model Version Endpoint](user-guide/model_version_endpoint.md)
* [Model Endpoint](user-guide/model_endpoint.md)
* [Model Deployment and Serving](user-guide/model_deployment_serving.md)
* [Delete a Model](user-guide/model_deletion.md)
* [Delete a Model Version](user-guide/model_version_deletion.md)
* [Batch Prediction](user-guide/batch_prediction.md)
* [Transformer](user-guide/transformer.md)
* [Standard Transformer](user-guide/standard_transformer.md)
* [Standard Transformer Expression](user-guide/transformer_expressions.md)
* [Standard Transformer for UPI](user-guide/standard_transformer_upi.md)
* [Custom Transformer](user-guide/custom_transformer.md)
* [Examples](user-guide/examples/README.md)
* [Deploy Standard Models](user-guide/examples/standard_model.md)
* [Deploy PyFunc Model](user-guide/examples/pyfunc_model.md)
* [Run Batch Prediction Job](user-guide/examples/batch_prediction.md)
* [Using Transformers](user-guide/examples/transformer.md)
* [Others](user-guide/examples/others.md)
* [Basic Concepts](user/basics.md)
* [Create a Model](user/model.md)
* [Create a Model Version](user/model_version.md)
* [Model Version Endpoint](user/model_version_endpoint.md)
* [Model Endpoint](user/model_endpoint.md)
* [Model Deployment and Serving](user/model_deployment_serving.md)
* [Delete a Model](user/model_deletion.md)
* [Delete a Model Version](user/model_version_deletion.md)
* [Batch Prediction](user/batch_prediction.md)
* [Transformer](user/transformer.md)
* [Standard Transformer](user/standard_transformer.md)
* [Standard Transformer Expression](user/transformer_expressions.md)
* [Standard Transformer for UPI](user/standard_transformer_upi.md)
* [Custom Transformer](user/custom_transformer.md)
* [Examples](user/examples/README.md)
* [Deploy Standard Models](user/examples/standard_model.md)
* [Deploy PyFunc Model](user/examples/pyfunc_model.md)
* [Run Batch Prediction Job](user/examples/batch_prediction.md)
* [Using Transformers](user/examples/transformer.md)
* [Others](user/examples/others.md)

## Developer Guides

* [Deploying Merlin](dev-guide/deploying-merlin/README.md)
* [Local Development](dev-guide/deploying-merlin/local_development.md)
* [Architecture Overview](dev-guide/architecture.md)
* [Deploying Merlin](developer/deploying-merlin/README.md)
* [Local Development](developer/deploying-merlin/local_development.md)
* [Architecture Overview](developer/architecture.md)

## Reference

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ The big advantage of a golang-migrate is that it can read migration files from t

### Merlin SDK

[Merlin SDK](./../connecting-to-merlin/python-sdk.md) is a python library for interacting with Merlin. Data scientist can install merlin-sdk from Pypi and import it into their Python project or Jupyter notebook. It provides all the functionalites that users are allowed to perform in Merlin. Models can only be logged via the SDK.
[Merlin SDK](./../user/connecting-to-merlin/python-sdk.md) is a python library for interacting with Merlin. Data scientist can install merlin-sdk from Pypi and import it into their Python project or Jupyter notebook. It provides all the functionalites that users are allowed to perform in Merlin. Models can only be logged via the SDK.

Upon installing the sdk, you will also have access to the [Merlin CLI](./../connecting-to-merlin/merlin-cli.md)
Upon installing the sdk, you will also have access to the [Merlin CLI](./../user/connecting-to-merlin/merlin-cli.md)

### CaraML MLP

Expand Down
File renamed without changes.
File renamed without changes.
13 changes: 0 additions & 13 deletions docs/getting-started/README.md

This file was deleted.

Empty file added docs/maintainer/.gitkeep
Empty file.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit fe2e7c5

Please sign in to comment.