clean repo (#12)

This PR is to clean the repo. This is ongoing work to sanitize the
Branches repo.

---------

Co-authored-by: Rami Sbahi <[email protected]>

Author: arunpatro

.gitignore

@@ -22,4 +22,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
-.env
+.env
+.vercel

CONTRIBUTING.md

@@ -1,6 +1,6 @@
-## Contributing to Flux
+## Contributing to Branches
 
-Thanks for your interest in improving Flux!
+Thanks for your interest in improving Branches!
 
 There are multiple opportunities to contribute at any level. It doesn't matter if you are just getting started with Rust or are the most weathered expert, we can use your help.
 
@@ -11,7 +11,7 @@ It should be considered as a guide to help you navigate the process.
 
 ### Code of Conduct
 
-Flux adheres to the [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct) (even though it's not a Rust project). This code of conduct describes the _minimum_ behavior expected from all contributors.
+Branches adheres to the [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct) (even though it's not a Rust project). This code of conduct describes the _minimum_ behavior expected from all contributors.
 
 Instances of violations of the Code of Conduct can be reported by contacting the team at [[email protected]](mailto:[email protected]).
 
@@ -20,7 +20,7 @@ Instances of violations of the Code of Conduct can be reported by contacting the
 There are fundamentally four ways an individual can contribute:
 
 1. **By opening an issue:** For example, if you believe that you have uncovered a bug
-   in Flux, creating a new issue in the issue tracker is the way to report it.
+   in Branches, creating a new issue in the issue tracker is the way to report it.
 2. **By adding context:** Providing additional context to existing issues,
    such as screenshots, code snippets and helps resolve issues.
 3. **By resolving issues:** Typically this is done in the form of either
@@ -55,7 +55,7 @@ If you have examples of other tools that have the feature you are requesting, pl
 
 ### Resolving an issue
 
-Pull requests are the way concrete changes are made to the code and dependencies of Flux.
+Pull requests are the way concrete changes are made to the code and dependencies of Branches.
 
 Even tiny pull requests, like fixing wording, are greatly appreciated. Before making a large change, it is usually
 a good idea to first open an issue describing the change to solicit feedback and guidance. This will increase
@@ -82,7 +82,7 @@ Keep an eye out for comments from code owners to provide guidance on conflicting
 
 #### Reviewing pull requests
 
-**Any Flux community member is welcome to review any pull request**.
+**Any Branches community member is welcome to review any pull request**.
 
 All contributors who choose to review and provide feedback on pull requests have a responsibility to both the project and individual making the contribution. Reviews and feedback must be helpful, insightful, and geared towards improving the contribution as opposed to simply blocking it. If there are reasons why you feel the PR should not be merged, explain what those are. Do not expect to be able to block a PR from advancing simply because you say "no" without giving an explanation. Be open to having your mind changed. Be open to working _with_ the contributor to make the pull request better.
 
@@ -98,8 +98,8 @@ It is tempting to micro-optimize and make everything about relative performance,
 
 Focus first on the most significant aspects of the change:
 
-1. Does this change make sense for Flux?
-2. Does this change make Flux better, even if only incrementally?
+1. Does this change make sense for Branches?
+2. Does this change make Branches better, even if only incrementally?
 3. Are there clear bugs or larger scale issues that need attending?
 4. Are the commit messages readable and correct? If it contains a breaking change, is it clear enough?
 
@@ -109,15 +109,15 @@ When changes are necessary, _request_ them, do not _demand_ them, and **do not a
 
 Specific performance optimization techniques, coding styles and conventions change over time. The first impression you give to a new contributor never does.
 
-Nits (requests for small changes that are not essential) are fine, but try to avoid stalling the pull request. Most nits can typically be fixed by the Flux maintainers merging the pull request, but they can also be an opportunity for the contributor to learn a bit more about the project.
+Nits (requests for small changes that are not essential) are fine, but try to avoid stalling the pull request. Most nits can typically be fixed by the Branches maintainers merging the pull request, but they can also be an opportunity for the contributor to learn a bit more about the project.
 
 It is always good to clearly indicate nits when you comment, e.g.: `nit: change foo() to bar(). But this is not blocking`.
 
 If your comments were addressed but were not folded after new commits, or if they proved to be mistaken, please, hide them with the appropriate reason to keep the conversation flow concise and relevant.
 
 ##### Be aware of the person behind the code
 
-Be aware that _how_ you communicate requests and reviews in your feedback can have a significant impact on the success of the pull request. Yes, we may merge a particular change that makes Flux better, but the individual might just not want to have anything to do with Flux ever again. The goal is not just having good code.
+Be aware that _how_ you communicate requests and reviews in your feedback can have a significant impact on the success of the pull request. Yes, we may merge a particular change that makes Branches better, but the individual might just not want to have anything to do with Branches ever again. The goal is not just having good code.
 
 ##### Abandoned or stale pull requests
 

src/components/App.tsx

@@ -12,16 +12,16 @@ import {
   SAVED_CHAT_SIZE_LOCAL_STORAGE_KEY,
 } from "../utils/constants";
 import { useDebouncedEffect } from "../utils/debounce";
-import { newFluxEdge } from "../utils/fluxEdge";
+import { newBranchesEdge } from "../utils/branchesEdge";
 import {
-  getFluxNode,
-  newFluxNode,
-  appendTextToFluxNodeAsGPT,
-  getFluxNodeLineage,
-  modifyFluxNodeText,
+  getBranchesNode,
+  newBranchesNode,
+  appendTextToBranchesNodeAsGPT,
+  getBranchesNodeLineage,
+  modifyBranchesNodeText,
   markOnlyNodeAsSelected,
   getConnectionAllowed,
-} from "../utils/fluxNode";
+} from "../utils/branchesNode";
 import { useLocalStorage } from "../utils/lstore";
 import { getAvailableChatModels } from "../utils/models";
 import { generateNodeId, generateStreamId } from "../utils/nodeId";
@@ -34,7 +34,7 @@ import { resetURL } from "../utils/qparams";
 import { useDebouncedWindowResize } from "../utils/resize";
 import {
   ToTNodeData,
-  FluxNodeType,
+  BranchesNodeType,
   Settings,
   HumanEvalProblemsType,
 } from "../utils/types";
@@ -71,7 +71,7 @@ import ReactFlow, {
 import "reactflow/dist/style.css";
 import { yieldStream } from "yield-stream";
 import { treeDemo } from "./tree";
-import { getFluxNodeColor } from "../utils/color";
+import { getBranchesNodeColor } from "../utils/color";
 import { getEncoding, encodingForModel } from "js-tiktoken";
 
 const HUMAN_EVAL_PROBLEMS = rawHumanEvalProblems as HumanEvalProblemsType;
@@ -219,17 +219,17 @@ function App() {
     const temp = settings.temp;
     const model = settings.model;
     const parentNode = selectedNodeLineage[0];
-    const submittedNode = getFluxNode(nodes, parentNode.id)!;
+    const submittedNode = getBranchesNode(nodes, parentNode.id)!;
 
     console.log("current node", submittedNode);
 
     type SetNodes = React.Dispatch<React.SetStateAction<Node[]>>;
     type SetEdges = React.Dispatch<React.SetStateAction<Edge[]>>;
-    type FluxNodeInput = {
+    type BranchesNodeInput = {
       id?: string;
       x: number;
       y: number;
-      fluxNodeType: FluxNodeType;
+      branchesNodeType: BranchesNodeType;
       input: string;
       text: string;
       streamId?: string;
@@ -239,16 +239,16 @@ function App() {
       style: any;
       explanations: any[];
     };
-    type FluxEdgeInput = {
+    type BranchesEdgeInput = {
       source: string;
       target: string;
       animated: boolean;
     }
 
     const createNewNodeAndEdge = (
       currentNode: Node,
-      newFluxNode: (node: FluxNodeInput) => Node,
-      newFluxEdge: (node: FluxEdgeInput) => Edge,
+      newBranchesNode: (node: BranchesNodeInput) => Node,
+      newBranchesEdge: (node: BranchesEdgeInput) => Edge,
       setNodes: SetNodes,
       setEdges: SetEdges,
       streamId: string,
@@ -264,19 +264,19 @@ function App() {
         }
 
         // Create a new node using the currentErrors
-        const newNode = newFluxNode({
+        const newNode = newBranchesNode({
           id: currentChildNodeId,
           x: matchingNode.position.x + 10,
           y: matchingNode.position.y + 100,
-          fluxNodeType: FluxNodeType.GPT,
+          branchesNodeType: BranchesNodeType.GPT,
           input: matchingNode.data.input,
           text: "",
           streamId,
           steps: [...matchingNode.data.steps, ""],
           solutions: isSolutionNode
             ? [...matchingNode.data.solutions, ""]
             : [...matchingNode.data.solutions],
-          style: { background: getFluxNodeColor(!isSolutionNode, true, false, true, 0) },
+          style: { background: getBranchesNodeColor(!isSolutionNode, true, false, true, 0) },
           errors: [...matchingNode.data.errors],
           explanations: isSolutionNode
             ? [...matchingNode.data.explanations]
@@ -290,7 +290,7 @@ function App() {
 
       setEdges((prevEdges) => [
         ...prevEdges,
-        newFluxEdge({
+        newBranchesEdge({
           source: currentNode.id,
           target: currentChildNodeId,
           animated: true,
@@ -312,7 +312,7 @@ function App() {
             return {
               ...node,
               style: {
-                background: getFluxNodeColor(
+                background: getBranchesNodeColor(
                   isExplanation || false,
                   false,
                   node.data.isTerminal || false,
@@ -509,7 +509,7 @@ function App() {
               modifiedNode = {
                 ...node,
                 style: {
-                  background: getFluxNodeColor(
+                  background: getBranchesNodeColor(
                     isExplanation,
                     false,
                     isTerminal,
@@ -596,8 +596,8 @@ function App() {
             if (isNewNode) {
               createNewNodeAndEdge(
                 node,
-                newFluxNode,
-                newFluxEdge,
+                newBranchesNode,
+                newBranchesEdge,
                 setNodes,
                 setEdges,
                 streamId,
@@ -611,7 +611,7 @@ function App() {
             currentText += chars;
 
             setNodes((prevNodes: Node<ToTNodeData>[]) => {
-              return appendTextToFluxNodeAsGPT(
+              return appendTextToBranchesNodeAsGPT(
                 prevNodes,
                 {
                   id: currentChildNode?.id!,
@@ -679,7 +679,7 @@ function App() {
   const [selectedNodeId, setSelectedNodeId] = useState<string | null>(null);
 
   const selectedNodeLineage =
-    selectedNodeId !== null ? getFluxNodeLineage(nodes, edges, selectedNodeId) : [];
+    selectedNodeId !== null ? getBranchesNodeLineage(nodes, edges, selectedNodeId) : [];
 
   /*//////////////////////////////////////////////////////////////
                         NODE MUTATION CALLBACKS
@@ -971,7 +971,7 @@ function App() {
               submitPrompt={submitPrompt}
               onPromptType={(text: string) => {
                 setNodes((nodes) =>
-                  modifyFluxNodeText(nodes, {
+                  modifyBranchesNodeText(nodes, {
                     asHuman: true,
                     id: selectedNodeId!,
                     text,

src/components/NodeInfo.tsx

@@ -18,7 +18,7 @@ import { CheckIcon } from "@chakra-ui/icons";
 import { MdCheck, MdQuestionMark, MdClose, MdThumbUpOffAlt } from "react-icons/md";
 import { Settings, ToTNodeData, HumanEvalProblemsType } from "../utils/types";
 import { Prompt } from "./Prompt";
-import { getFluxNodeParent } from "../utils/fluxNode";
+import { getBranchesNodeParent } from "../utils/branchesNode";
 import { useEffect, useState } from "react";
 import { Markdown } from "./utils/Markdown";
 import { Row } from "../utils/chakra";
@@ -87,7 +87,7 @@ export function NodeInfo({
 
   useEffect(() => {
     const newSelectedNodeParent =
-      selectedNodeId !== null ? getFluxNodeParent(nodes, edges, selectedNodeId) : null;
+      selectedNodeId !== null ? getBranchesNodeParent(nodes, edges, selectedNodeId) : null;
     setSelectedNodeParent(newSelectedNodeParent);
   }, [selectedNodeId, nodes, edges]);
 
@@ -137,7 +137,7 @@ export function NodeInfo({
         _hover={{
           boxShadow: "0 0 0 0.5px #1a192b", // isLast ? "none" : "0 0 0 0.5px #1a192b",
         }}
-        // borderColor={getFluxNodeTypeDarkColor(data.fluxNodeType)}
+        // borderColor={getBranchesNodeTypeDarkColor(data.branchesNodeType)}
         // position="relative"
         //onMouseEnter={() => setHoveredNodeId(node.id)}
         ///onMouseLeave={() => setHoveredNodeId(null)}

src/components/Prompt.tsx

@@ -1,8 +1,8 @@
 import { MIXPANEL_TOKEN } from "../main";
 import { Row, Center, Column } from "../utils/chakra";
-import { getFluxNodeColor, getFluxNodeTypeDarkColor } from "../utils/color";
-import { setFluxNodeStreamId } from "../utils/fluxNode";
-import { ToTNodeData, FluxNodeType, Settings } from "../utils/types";
+import { getBranchesNodeColor, getBranchesNodeTypeDarkColor } from "../utils/color";
+import { setBranchesNodeStreamId } from "../utils/branchesNode";
+import { ToTNodeData, BranchesNodeType, Settings } from "../utils/types";
 import { BigButton } from "./utils/BigButton";
 import { Markdown } from "./utils/Markdown";
 import { NotAllowedIcon } from "@chakra-ui/icons";
@@ -26,7 +26,7 @@ export function Prompt({
 
   // const promptNode = lineage[0];
 
-  // const promptNodeType = selectedNode.data.fluxNodeType;
+  // const promptNodeType = selectedNode.data.branchesNodeType;
 
   const onMainButtonClick = () => {
     submitPrompt();
@@ -35,7 +35,7 @@ export function Prompt({
   const stopGenerating = () => {
     // Reset the stream id.
     setNodes((nodes) =>
-      setFluxNodeStreamId(nodes, { id: selectedNode?.id ?? '', streamId: undefined })
+      setBranchesNodeStreamId(nodes, { id: selectedNode?.id ?? '', streamId: undefined })
     );
 
     if (MIXPANEL_TOKEN) mixpanel.track("Stopped generating response");
@@ -93,7 +93,7 @@ export function Prompt({
                 _hover={{
                   boxShadow: "0 0 0 0.5px #1a192b", // isLast ? "none" : "0 0 0 0.5px #1a192b",
                 }}
-                borderColor={getFluxNodeTypeDarkColor(data.fluxNodeType)}
+                borderColor={getBranchesNodeTypeDarkColor(data.branchesNodeType)}
                 position="relative"
                 //onMouseEnter={() => setHoveredNodeId(node.id)}
                 ///onMouseLeave={() => setHoveredNodeId(null)}
@@ -180,7 +180,7 @@ export function Prompt({
                   _hover={{
                     boxShadow: "0 0 0 0.5px #1a192b", // isLast ? "none" : "0 0 0 0.5px #1a192b",
                   }}
-                  borderColor={getFluxNodeTypeDarkColor(data.fluxNodeType)}
+                  borderColor={getBranchesNodeTypeDarkColor(data.branchesNodeType)}
                   position="relative"
                   bg={currExplanationNode?.style?.background as string || "#FFFFFF"}
                   key={currExplanationNode?.id}
@@ -220,7 +220,7 @@ export function Prompt({
           <BigButton
             tooltip=""
             onClick={onMainButtonClick}
-            color={getFluxNodeTypeDarkColor(FluxNodeType.User)}
+            color={getBranchesNodeTypeDarkColor(BranchesNodeType.User)}
             width="100%"
             height="100%"
             fontSize="lg"

src/components/modals/SettingsModal.tsx

@@ -1,7 +1,7 @@
 import { MIXPANEL_TOKEN } from "../../main";
-import { getFluxNodeTypeDarkColor } from "../../utils/color";
+import { getBranchesNodeTypeDarkColor } from "../../utils/color";
 import { DEFAULT_SETTINGS } from "../../utils/constants";
-import { Settings, FluxNodeType } from "../../utils/types";
+import { Settings, BranchesNodeType } from "../../utils/types";
 import { APIKeyInput } from "../utils/APIKeyInput";
 import { LabeledSelect, LabeledSlider } from "../utils/LabeledInputs";
 
@@ -99,7 +99,7 @@ export const SettingsModal = memo(function SettingsModal({
 
               if (MIXPANEL_TOKEN) mixpanel.track("Changed temperature");
             }}
-            color={getFluxNodeTypeDarkColor(FluxNodeType.User)}
+            color={getBranchesNodeTypeDarkColor(BranchesNodeType.User)}
             max={1.25}
             min={0}
             step={0.01}
@@ -114,7 +114,7 @@ export const SettingsModal = memo(function SettingsModal({
 
               if (MIXPANEL_TOKEN) mixpanel.track("Changed answer fanout");
             }}
-            color={getFluxNodeTypeDarkColor(FluxNodeType.User)}
+            color={getBranchesNodeTypeDarkColor(BranchesNodeType.User)}
             max={10}
             min={1}
             step={1}
@@ -129,7 +129,7 @@ export const SettingsModal = memo(function SettingsModal({
 
               if (MIXPANEL_TOKEN) mixpanel.track("Changed explanation fanout");
             }}
-            color={getFluxNodeTypeDarkColor(FluxNodeType.User)}
+            color={getBranchesNodeTypeDarkColor(BranchesNodeType.User)}
             max={10}
             min={1}
             step={1}

src/components/nodes/LabelUpdaterNode.tsx

@@ -1,6 +1,6 @@
 import { MIXPANEL_TOKEN } from "../../main";
 import { Row } from "../../utils/chakra";
-import { modifyFluxNodeLabel, modifyReactFlowNodeProperties } from "../../utils/fluxNode";
+import { modifyBranchesNodeLabel, modifyReactFlowNodeProperties } from "../../utils/branchesNode";
 import { ToTNodeData } from "../../utils/types";
 import { Box, Input, Tooltip } from "@chakra-ui/react";
 import mixpanel from "mixpanel-browser";
@@ -48,7 +48,7 @@ export function LabelUpdaterNode({
 
   const submit = () => {
     setNodes((nodes) =>
-      modifyFluxNodeLabel(nodes, {
+      modifyBranchesNodeLabel(nodes, {
         id,
         label: renameLabel,
       })