Skip to content

Commit

Permalink
Merge pull request #1359 from Oneirocom/development
Browse files Browse the repository at this point in the history
Merge dev into prod
  • Loading branch information
parzival418 authored Oct 11, 2023
2 parents d3da638 + 9517d54 commit f4771bb
Show file tree
Hide file tree
Showing 14 changed files with 15,115 additions and 10,879 deletions.
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
- Search Google, Wikipedia and the Semantic Web
- Many included powertools, including voice and image generation and vector search
- Powerful graph-based IDE for complex data pipelines
- Graphs can be embedded in subgraphs and shared for rapid community development
- Graphs can be embedded in subgraphs and shared for rapid community development.

## 🔮 Magick: Automate, Build, and Bring Your Ideas to Life with AI.

Expand All @@ -44,16 +44,16 @@ With Magick, you can unleash the power of AI without needing to know how to code

### Spells

A spell is a pipeline that describes data moving from one place to another, running through different processes we call "nodes", via wires we call "connections". In Magick, the collection of data, nodes, variables, and presets for each graph is known as a "spell".
Spell is not a machine learning term.
A spell is a pipeline that describes data moving from one place to another, running through different processes we call "nodes", via wires we call "connections". In Magick, the collection of data, nodes, variables, and presets for each graph is known as a "spell".
Spell is not a machine learning term.

We just like it. Spells can be imported and exported at any time. Spells in their raw form are JSON, a standard format that is easy to share.

### Nodes

**At the core, Magick is a system for taking in data, doing stuff to it, and then sending the final data out.**

This "stuff" is called a "transformation", the data transforms from one thing into the next. The "stuff" that is happening to the data is a black box that takes something in, anything, and returns something out.
This "stuff" is called a "transformation", the data transforms from one thing into the next. The "stuff" that is happening to the data is a black box that takes something in, anything, and returns something out.

We call the black box where the transformstion takes place a "node". Nodes are the building blocks of Magick.

Expand All @@ -72,7 +72,6 @@ Nodes can be deleted by right-clicking on them and selecting "Delete".
- Wait For All Node: Used to wait for different execution branches to complete before joining back into a single branch -- this is a good way to do several slow tasks at once.
- ...and lots more! (if you have suggestions for any, do let us know)


### Inputs and Outputs

All nodes have some inputs and/or outputs, although they don't necessarily have to have both. Inputs and outputs are visually displayed as sockets. The color of the socket determines the type of data it can receive, with "gray" being the default untyped or "any" type.
Expand All @@ -95,14 +94,14 @@ Triggers tell nodes to start asynchronous tasks. Some nodes can process data wit

Before you start, ensure you have the following software installed on your machine:

- **git**: Version control system, required for cloning the repository.
- **git**: Version control system, required for cloning the repository.
- [Download git](https://git-scm.com/downloads)
- **node.js 18+**: JavaScript runtime, needed for running the application.
- [Download Node.js](https://nodejs.org/en/download/)
- **Docker**: Enables you to run the project within containers for easier setup and distribution.
- [Download Docker Desktop](https://www.docker.com/products/docker-desktop)

Follow the respective installation guides to set up each piece of software.
Follow the respective installation guides to set up each piece of software.

Once installed, proceed to set up Magick.

Expand Down Expand Up @@ -174,7 +173,9 @@ Developing locally, it can be very helpful to have google chrome accept all self
## Contributors

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->

[![All Contributors](https://img.shields.io/badge/all_contributors-27-orange.svg?style=flat-square)](#contributors-)

<!-- ALL-CONTRIBUTORS-BADGE:END -->

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
Expand Down
2 changes: 1 addition & 1 deletion apps/client/src/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
--card: 224 71% 4%;
--card-foreground: 213 31% 91%;

--primary: 210 40% 98%;
/* --primary: 210 40% 98%; */
--primary-foreground: 222.2 47.4% 1.2%;

/* --secondary: 222.2 47.4% 11.2%; */
Expand Down
5 changes: 4 additions & 1 deletion apps/client/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ module.exports = {
),
...createGlobPatternsForDependencies(__dirname),
],
corePlugins: {
preflight: false,
},
theme: {
container: {
center: true,
Expand All @@ -30,7 +33,7 @@ module.exports = {
foreground: 'hsl(var(--primary-foreground))',
},
secondary: {
DEFAULT: 'hsl(var(--secondary))',
DEFAULT: 'hsl(var(--secondary))',
foreground: 'hsl(var(--secondary-foreground))',
},
destructive: {
Expand Down
Loading

1 comment on commit f4771bb

@vercel
Copy link

@vercel vercel bot commented on f4771bb Oct 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.