From e950239d1c033992a545bee6e95b049147aa39ac Mon Sep 17 00:00:00 2001
From: Shelwin <shelwinsunga@gmail.com>
Date: Thu, 3 Oct 2024 15:50:12 -0500
Subject: [PATCH 01/20] lightmode fix

---
 docs/src/_templates/header.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/src/_templates/header.html b/docs/src/_templates/header.html
index bb60adbf..3136f9f6 100644
--- a/docs/src/_templates/header.html
+++ b/docs/src/_templates/header.html
@@ -31,7 +31,7 @@
     background-clip: padding-box, border-box, border-box;
     background-origin: border-box;
     border: calc(0.08 * 1rem) solid transparent;
-    color: #030303;
+    color: #fff;
     background-image: 
       linear-gradient(#121213, #121213),
       linear-gradient(#121213 50%, rgba(18,18,19,0.6) 80%, rgba(18,18,19,0)),
@@ -55,12 +55,14 @@
 }
 
 .dark .github-star-btn {
+  color: #030303;
     background-image: 
       linear-gradient(#fff, #fff),
       linear-gradient(#fff 50%, rgba(255,255,255,0.6) 80%, rgba(0,0,0,0)),
       linear-gradient(90deg, hsl(var(--color-1)), hsl(var(--color-5)), hsl(var(--color-3)), hsl(var(--color-4)), hsl(var(--color-2)));
 }
 
+
 @media (max-width: 640px) {
     .github-star-btn {
         font-size: 12px;

From dcd9d2670a1de3586b575afe8de23c2cd2e15ed6 Mon Sep 17 00:00:00 2001
From: Shelwin <shelwinsunga@gmail.com>
Date: Thu, 3 Oct 2024 15:53:10 -0500
Subject: [PATCH 02/20] chore: whitespace

---
 docs/src/_templates/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/_templates/header.html b/docs/src/_templates/header.html
index 3136f9f6..5e0129f6 100644
--- a/docs/src/_templates/header.html
+++ b/docs/src/_templates/header.html
@@ -55,7 +55,7 @@
 }
 
 .dark .github-star-btn {
-  color: #030303;
+    color: #030303;
     background-image: 
       linear-gradient(#fff, #fff),
       linear-gradient(#fff 50%, rgba(255,255,255,0.6) 80%, rgba(0,0,0,0)),

From 805c698ad697bdff9f9f73ef31c8ace780e70bd2 Mon Sep 17 00:00:00 2001
From: Shelwin <shelwinsunga@gmail.com>
Date: Thu, 3 Oct 2024 19:19:33 -0500
Subject: [PATCH 03/20] prelim nav

---
 docs/src/_templates/header.html | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/docs/src/_templates/header.html b/docs/src/_templates/header.html
index 5e0129f6..5398b5bf 100644
--- a/docs/src/_templates/header.html
+++ b/docs/src/_templates/header.html
@@ -62,18 +62,20 @@
       linear-gradient(90deg, hsl(var(--color-1)), hsl(var(--color-5)), hsl(var(--color-3)), hsl(var(--color-4)), hsl(var(--color-2)));
 }
 
+nav a {
+  white-space: nowrap;
+}
+
 
 @media (max-width: 640px) {
     .github-star-btn {
         font-size: 12px;
         padding: 0.4rem 0.8rem;
     }
-    .github-star-btn .star-icon,
-    .github-star-btn .star-count {
-        display: none;
-    }
 }
 </style>
+
+
 <a href="{{ pathto(master_doc) }}" class="flex items-center mr-6">
     {%- if logo_url %}
       <img height="24" width="120" class="mr-2 dark:invert" src="{{ logo_url }}" alt="Logo" />
@@ -88,14 +90,14 @@
 {% endblock header_logo %}
 
 {%- block header_right %}
-<div class="flex items-center justify-between flex-1 space-x-2 sm:space-x-4 md:justify-end">
+<div class="flex flex-wrap items-center justify-between flex-1 space-x-2 sm:space-x-4 md:justify-end">
   {%- if docsearch or hasdoc('search') %}
-  <div class="ml-4">
-    <a href="https://github.com/madcowd/ell" target="_blank" rel="noopener noreferrer" class="github-star-btn">
+  <div class="w-full md:w-auto mb-2 md:mb-0">
+    <a href="https://github.com/madcowd/ell" target="_blank" rel="noopener noreferrer" class="github-star-btn whitespace-nowrap">
       <svg class="w-5 h-5 mr-2" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
         <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd" />
       </svg>
-      <span class="font-medium">Star on GitHub</span>
+      <span class="font-medium ">Star on GitHub</span>
       <svg class="star-icon w-4 h-4 ml-2" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
         <path d="M12 2L15.09 8.26L22 9.27L17 14.14L18.18 21.02L12 17.77L5.82 21.02L7 14.14L2 9.27L8.91 8.26L12 2Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
           <animate attributeName="opacity" values="1;0.7;1" dur="2s" repeatCount="indefinite" />
@@ -104,7 +106,6 @@
       <span class="ml-2 star-count" data-stars="0" style="min-width: 3ch; text-align: center;">0</span>
     </a>
   </div>
-
   <script>
     document.addEventListener('DOMContentLoaded', function() {
       const starBtn = document.querySelector('.github-star-btn');
@@ -135,18 +136,18 @@
 
   </script>
 
-  <div class="flex-1 w-full md:w-auto md:flex-none">
+  <div class="w-full md:w-auto md:flex-none">
     {%- include "searchbox.html" %}
   </div>
   {%- endif %}
 
   {%- block extra_header_link_icons %}
-  <nav class="flex items-center space-x-1">
+  <nav class="flex items-center space-x-1 mt-2 md:mt-0">
     {%- if theme_extra_header_link_icons|tobool %}
     {%- for text,url in theme_extra_header_link_icons.items() %}
     {%- if url is mapping %}
     <a href="{{ url.link }}" title="Visit {{ text }}" rel="noopener nofollow">
-      <div
+      <div 
         class="inline-flex items-center justify-center px-0 text-sm font-medium transition-colors rounded-md disabled:opacity-50 disabled:pointer-events-none hover:bg-accent hover:text-accent-foreground h-9 w-9">
         {{ url.icon }}
       </div>

From e3fdd02809655cc68120f28c5b9eecbc0dd8f1b4 Mon Sep 17 00:00:00 2001
From: Shelwin <shelwinsunga@gmail.com>
Date: Thu, 3 Oct 2024 19:44:21 -0500
Subject: [PATCH 04/20] update nav

---
 docs/src/_templates/header.html | 6 +++---
 docs/src/conf.py                | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/docs/src/_templates/header.html b/docs/src/_templates/header.html
index 5398b5bf..c625ab4c 100644
--- a/docs/src/_templates/header.html
+++ b/docs/src/_templates/header.html
@@ -92,12 +92,12 @@
 {%- block header_right %}
 <div class="flex flex-wrap items-center justify-between flex-1 space-x-2 sm:space-x-4 md:justify-end">
   {%- if docsearch or hasdoc('search') %}
-  <div class="w-full md:w-auto mb-2 md:mb-0">
+  <div class=" md:w-auto mb-2 md:mb-0">
     <a href="https://github.com/madcowd/ell" target="_blank" rel="noopener noreferrer" class="github-star-btn whitespace-nowrap">
-      <svg class="w-5 h-5 mr-2" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
+      <svg class="w-5 h-5 mr-2 hidden sm:inline-block" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
         <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd" />
       </svg>
-      <span class="font-medium ">Star on GitHub</span>
+      <span class="font-medium hidden md:inline">Star on GitHub</span>
       <svg class="star-icon w-4 h-4 ml-2" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
         <path d="M12 2L15.09 8.26L22 9.27L17 14.14L18.18 21.02L12 17.77L5.82 21.02L7 14.14L2 9.27L8.91 8.26L12 2Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
           <animate attributeName="opacity" values="1;0.7;1" dur="2s" repeatCount="indefinite" />
diff --git a/docs/src/conf.py b/docs/src/conf.py
index 9ae35a64..c51b0283 100644
--- a/docs/src/conf.py
+++ b/docs/src/conf.py
@@ -37,10 +37,6 @@
         "AI Jobs Board": "https://jobs.ell.so",
     },
     "extra_header_link_icons": {
-        "GitHub": {
-            "link": "https://github.com/MadcowD/ell",
-            "icon": """<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" height="18" fill="currentColor"><path d="M12 0C5.373 0 0 5.373 0 12c0 5.302 3.438 9.8 8.205 11.387.6.111.82-.261.82-.577 0-.285-.01-1.04-.015-2.04-3.338.726-4.042-1.61-4.042-1.61-.546-1.387-1.333-1.757-1.333-1.757-1.09-.745.083-.729.083-.729 1.205.084 1.84 1.238 1.84 1.238 1.07 1.835 2.807 1.305 3.492.998.108-.775.418-1.305.76-1.605-2.665-.305-5.466-1.332-5.466-5.93 0-1.31.467-2.38 1.235-3.22-.125-.303-.535-1.523.115-3.176 0 0 1.005-.322 3.3 1.23.955-.265 1.98-.398 3-.403 1.02.005 2.045.138 3 .403 2.28-1.552 3.285-1.23 3.285-1.23.655 1.653.245 2.873.12 3.176.77.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.62-5.475 5.92.43.37.81 1.1.81 2.22 0 1.605-.015 2.895-.015 3.285 0 .32.215.694.825.575C20.565 21.795 24 17.3 24 12c0-6.627-5.373-12-12-12z"/></svg>""",
-        },
         "Discord": {
         "link": "https://discord.gg/vWntgU52Xb",
             "icon": """<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512" height="18" fill="currentColor"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M524.5 69.8a1.5 1.5 0 0 0 -.8-.7A485.1 485.1 0 0 0 404.1 32a1.8 1.8 0 0 0 -1.9 .9 337.5 337.5 0 0 0 -14.9 30.6 447.8 447.8 0 0 0 -134.4 0 309.5 309.5 0 0 0 -15.1-30.6 1.9 1.9 0 0 0 -1.9-.9A483.7 483.7 0 0 0 116.1 69.1a1.7 1.7 0 0 0 -.8 .7C39.1 183.7 18.2 294.7 28.4 404.4a2 2 0 0 0 .8 1.4A487.7 487.7 0 0 0 176 479.9a1.9 1.9 0 0 0 2.1-.7A348.2 348.2 0 0 0 208.1 430.4a1.9 1.9 0 0 0 -1-2.6 321.2 321.2 0 0 1 -45.9-21.9 1.9 1.9 0 0 1 -.2-3.1c3.1-2.3 6.2-4.7 9.1-7.1a1.8 1.8 0 0 1 1.9-.3c96.2 43.9 200.4 43.9 295.5 0a1.8 1.8 0 0 1 1.9 .2c2.9 2.4 6 4.9 9.1 7.2a1.9 1.9 0 0 1 -.2 3.1 301.4 301.4 0 0 1 -45.9 21.8 1.9 1.9 0 0 0 -1 2.6 391.1 391.1 0 0 0 30 48.8 1.9 1.9 0 0 0 2.1 .7A486 486 0 0 0 610.7 405.7a1.9 1.9 0 0 0 .8-1.4C623.7 277.6 590.9 167.5 524.5 69.8zM222.5 337.6c-29 0-52.8-26.6-52.8-59.2S193.1 219.1 222.5 219.1c29.7 0 53.3 26.8 52.8 59.2C275.3 311 251.9 337.6 222.5 337.6zm195.4 0c-29 0-52.8-26.6-52.8-59.2S388.4 219.1 417.9 219.1c29.7 0 53.3 26.8 52.8 59.2C470.7 311 447.5 337.6 417.9 337.6z"/></svg>""",

From e8086fd9e10f64a0c49f13495508b7dcc37bf5af Mon Sep 17 00:00:00 2001
From: Shelwin <shelwinsunga@gmail.com>
Date: Thu, 3 Oct 2024 19:56:03 -0500
Subject: [PATCH 05/20] update header ordering

---
 docs/src/_templates/header.html | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/src/_templates/header.html b/docs/src/_templates/header.html
index c625ab4c..185a0620 100644
--- a/docs/src/_templates/header.html
+++ b/docs/src/_templates/header.html
@@ -62,10 +62,25 @@
       linear-gradient(90deg, hsl(var(--color-1)), hsl(var(--color-5)), hsl(var(--color-3)), hsl(var(--color-4)), hsl(var(--color-2)));
 }
 
+
 nav a {
   white-space: nowrap;
 }
 
+.twin-btn-container {
+    display: flex;
+    gap: 1rem;
+    align-items: center;
+    flex-direction: row-reverse;
+}
+
+@media (min-width: 640px) {
+    .twin-btn-container {
+        flex-direction: row;
+    }
+}
+
+
 
 @media (max-width: 640px) {
     .github-star-btn {
@@ -92,6 +107,7 @@
 {%- block header_right %}
 <div class="flex flex-wrap items-center justify-between flex-1 space-x-2 sm:space-x-4 md:justify-end">
   {%- if docsearch or hasdoc('search') %}
+  <div class="twin-btn-container">
   <div class=" md:w-auto mb-2 md:mb-0">
     <a href="https://github.com/madcowd/ell" target="_blank" rel="noopener noreferrer" class="github-star-btn whitespace-nowrap">
       <svg class="w-5 h-5 mr-2 hidden sm:inline-block" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
@@ -139,6 +155,7 @@
   <div class="w-full md:w-auto md:flex-none">
     {%- include "searchbox.html" %}
   </div>
+</div>
   {%- endif %}
 
   {%- block extra_header_link_icons %}

From 53d1def896d5ac5db3b74ac533125e1b911410a7 Mon Sep 17 00:00:00 2001
From: Shelwin <shelwinsunga@gmail.com>
Date: Thu, 3 Oct 2024 20:02:45 -0500
Subject: [PATCH 06/20] save

---
 docs/src/_templates/header.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/src/_templates/header.html b/docs/src/_templates/header.html
index 185a0620..c3b2fe42 100644
--- a/docs/src/_templates/header.html
+++ b/docs/src/_templates/header.html
@@ -72,16 +72,17 @@
     gap: 1rem;
     align-items: center;
     flex-direction: row-reverse;
+    width: 100%;
 }
 
-@media (min-width: 640px) {
+@media (min-width: 768px) {
     .twin-btn-container {
         flex-direction: row;
+        justify-content: flex-end;
     }
 }
 
 
-
 @media (max-width: 640px) {
     .github-star-btn {
         font-size: 12px;

From fcd13e46ef2c0bca3a996d1c20db35f63b14d3c7 Mon Sep 17 00:00:00 2001
From: Shelwin <shelwinsunga@gmail.com>
Date: Thu, 3 Oct 2024 20:16:34 -0500
Subject: [PATCH 07/20] hide on use

---
 docs/src/_templates/header.html | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/docs/src/_templates/header.html b/docs/src/_templates/header.html
index c3b2fe42..944f6ae7 100644
--- a/docs/src/_templates/header.html
+++ b/docs/src/_templates/header.html
@@ -89,6 +89,9 @@
         padding: 0.4rem 0.8rem;
     }
 }
+
+
+
 </style>
 
 
@@ -109,12 +112,12 @@
 <div class="flex flex-wrap items-center justify-between flex-1 space-x-2 sm:space-x-4 md:justify-end">
   {%- if docsearch or hasdoc('search') %}
   <div class="twin-btn-container">
-  <div class=" md:w-auto mb-2 md:mb-0">
+  <div class="github-star-btn-container md:w-auto mb-2 md:mb-0">
     <a href="https://github.com/madcowd/ell" target="_blank" rel="noopener noreferrer" class="github-star-btn whitespace-nowrap">
       <svg class="w-5 h-5 mr-2 hidden sm:inline-block" fill="currentColor" viewBox="0 0 24 24" aria-hidden="true">
         <path fill-rule="evenodd" d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z" clip-rule="evenodd" />
       </svg>
-      <span class="font-medium hidden md:inline">Star on GitHub</span>
+      <span class="font-medium">Star on GitHub</span>
       <svg class="star-icon w-4 h-4 ml-2" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
         <path d="M12 2L15.09 8.26L22 9.27L17 14.14L18.18 21.02L12 17.77L5.82 21.02L7 14.14L2 9.27L8.91 8.26L12 2Z" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
           <animate attributeName="opacity" values="1;0.7;1" dur="2s" repeatCount="indefinite" />
@@ -153,9 +156,30 @@
 
   </script>
 
-  <div class="w-full md:w-auto md:flex-none">
+  <div class="searchbox-container w-full md:w-auto md:flex-none">
     {%- include "searchbox.html" %}
   </div>
+
+  <script>
+    document.addEventListener('DOMContentLoaded', function() {
+      const searchInput = document.querySelector('.searchbox-container input');
+      const starBtnContainer = document.querySelector('.github-star-btn-container');
+  
+      if (searchInput && starBtnContainer) {
+        const isMobile = window.innerWidth < 768; // Adjust this breakpoint as needed
+  
+        if (isMobile) {
+          searchInput.addEventListener('focus', function() {
+            starBtnContainer.style.display = 'none';
+          });
+  
+          searchInput.addEventListener('blur', function() {
+            starBtnContainer.style.display = 'block';
+          });
+        }
+      }
+    });
+  </script>
 </div>
   {%- endif %}
 
@@ -182,7 +206,7 @@
       <svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 96 960 960" fill="currentColor"
         class="absolute transition-all scale-100 rotate-0 dark:-rotate-90 dark:scale-0">
         <path
-          d="M480 685q45.456 0 77.228-31.772Q589 621.456 589 576q0-45.456-31.772-77.228Q525.456 467 480 467q-45.456 0-77.228 31.772Q371 530.544 371 576q0 45.456 31.772 77.228Q434.544 685 480 685Zm0 91q-83 0-141.5-58.5T280 576q0-83 58.5-141.5T480 376q83 0 141.5 58.5T680 576q0 83-58.5 141.5T480 776ZM80 621.5q-19.152 0-32.326-13.174T34.5 576q0-19.152 13.174-32.326T80 530.5h80q19.152 0 32.326 13.174T205.5 576q0 19.152-13.174 32.326T160 621.5H80Zm720 0q-19.152 0-32.326-13.174T754.5 576q0-19.152 13.174-32.326T800 530.5h80q19.152 0 32.326 13.174T925.5 576q0 19.152-13.174 32.326T880 621.5h-80Zm-320-320q-19.152 0-32.326-13.174T434.5 256v-80q0-19.152 13.174-32.326T480 130.5q19.152 0 32.326 13.174T525.5 176v80q0 19.152-13.174 32.326T480 301.5Zm0 720q-19.152 0-32.326-13.17Q434.5 995.152 434.5 976v-80q0-19.152 13.174-32.326T480 850.5q19.152 0 32.326 13.174T525.5 896v80q0 19.152-13.174 32.33-13.174 13.17-32.326 13.17ZM222.174 382.065l-43-42Q165.5 327.391 166 308.239t13.174-33.065q13.435-13.674 32.587-13.674t32.065 13.674l42.239 43q12.674 13.435 12.555 31.706-.12 18.272-12.555 31.946-12.674 13.674-31.445 13.413-18.772-.261-32.446-13.174Zm494 494.761-42.239-43q-12.674-13.435-12.674-32.087t12.674-31.565Q686.609 756.5 705.38 757q18.772.5 32.446 13.174l43 41.761Q794.5 824.609 794 843.761t-13.174 33.065Q767.391 890.5 748.239 890.5t-32.065-13.674Zm-42-494.761Q660.5 369.391 661 350.62q.5-18.772 13.174-32.446l41.761-43Q728.609 261.5 747.761 262t33.065 13.174q13.674 13.435 13.674 32.587t-13.674 32.065l-43 42.239q-13.435 12.674-31.706 12.555-18.272-.12-31.946-12.555Zm-495 494.761Q165.5 863.391 165.5 844.239t13.674-32.065l43-42.239q13.435-12.674 32.087-12.674t31.565 12.674Q299.5 782.609 299 801.38q-.5 18.772-13.174 32.446l-41.761 43Q231.391 890.5 212.239 890t-33.065-13.174ZM480 576Z" />
+          d="M480 685q45.456 0 77.228-31.772Q589 621.456 589 576q0-45.456-31.772-77.228Q525.456 467 480 467q-45.456 0-77.228 31.772Q371 530.544 371 576q0 45.456 31.772 77.228Q434.544 685 480 685Zm0 91q-83 0-141.5-58.5T280 576q0-83 58.5-141.5T480 376q83 0 141.5 58.5T680 576q0 83-58.5 141.5T480 776ZM80 621.5q-19.152 0-32.326-13.174T34.5 576q0-19.152 13.174-32.326T80 530.5h80q19.152 0 32.326 13.174T205.5 576q0 19.152-13.174 32.326T160 621.5H80Zm720 0q-19.152 0-32.326-13.174T754.5 576q0-19.152 13.174-32.326T800 530.5h80q19.152 0 32.326 13.174T925.5 576q0 19.152-13.174 32.326T880 621.5h-80Zm-320-320q-19.152 0-32.326-13.17Q434.5 256.5 434.5 237.338t13.174-33.065q13.435-13.674 32.587-13.674t32.065 13.674l42.239 43q12.674 13.435 12.555 31.706-.12 18.272-12.555 31.946-12.674 13.674-31.445 13.413-18.772-.261-32.446-13.174Zm494 494.761-43-42Q794.609 824.609 794 843.761t-13.174 33.065Q767.391 890.5 748.239 890.5t-32.065-13.674Zm-42-494.761Q660.5 369.391 661 350.62q.5-18.772 13.174-32.446l41.761-43Q728.609 261.5 747.761 262t33.065 13.174q13.674 13.435 13.674 32.587t-13.674 32.065l-43 42.239q-13.435 12.674-31.706 12.555-18.272-.12-31.946-12.555Zm-495 494.761Q165.5 863.391 165.5 844.239t13.674-32.065l43-42.239q13.435-12.674 32.087-12.674t31.565 12.674Q299.5 782.609 299 801.38q-.5 18.772-13.174 32.446l-41.761 43Q231.391 890.5 212.239 890t-33.065-13.174ZM480 576Z" />
       </svg>
       <svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 96 960 960" fill="currentColor"
         class="absolute transition-all scale-0 rotate-90 dark:rotate-0 dark:scale-100">

From 4aa58fab391b8d413fb176ba341e5140ceabf48e Mon Sep 17 00:00:00 2001
From: Shelwin <shelwinsunga@gmail.com>
Date: Thu, 3 Oct 2024 20:30:34 -0500
Subject: [PATCH 08/20] fixed logo size

---
 docs/src/_templates/header.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/src/_templates/header.html b/docs/src/_templates/header.html
index 944f6ae7..7d7c8993 100644
--- a/docs/src/_templates/header.html
+++ b/docs/src/_templates/header.html
@@ -97,13 +97,13 @@
 
 <a href="{{ pathto(master_doc) }}" class="flex items-center mr-6">
     {%- if logo_url %}
-      <img height="24" width="120" class="mr-2 dark:invert" src="{{ logo_url }}" alt="Logo" />
+      <img height="24" width="120" class="mr-2 dark:invert" src="{{ logo_url }}" alt="Logo" style="min-width: 120px; max-width: 120px;" />
     {%- endif -%}
     {%- if theme_logo_dark and not logo_url %}
-      <img width="120" height="24" class="mr-2 hidden dark:block" src="{{ pathto('_static/' + theme_logo_dark, 1) }}" alt="Logo" />
+      <img width="120" height="24" class="mr-2 hidden dark:block" src="{{ pathto('_static/' + theme_logo_dark, 1) }}" alt="Logo" style="min-width: 120px; max-width: 120px;" />
     {%- endif -%}
     {%- if theme_logo_light and not logo_url %}
-    <img width="120" height="24" class="mr-2 dark:hidden" src="{{ pathto('_static/' + theme_logo_light, 1) }}" alt="Logo" />
+    <img width="120" height="24" class="mr-2 dark:hidden" src="{{ pathto('_static/' + theme_logo_light, 1) }}" alt="Logo" style="min-width: 120px; max-width: 120px;" />
     {%- endif -%}
 </a>
 {% endblock header_logo %}

From 439a161a0cfef9a685c7535ab16ea1b0a0b9acae Mon Sep 17 00:00:00 2001
From: Shelwin <shelwinsunga@gmail.com>
Date: Thu, 3 Oct 2024 20:46:49 -0500
Subject: [PATCH 09/20] claude messed up the sun svg

---
 docs/src/_templates/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/_templates/header.html b/docs/src/_templates/header.html
index 7d7c8993..a440782a 100644
--- a/docs/src/_templates/header.html
+++ b/docs/src/_templates/header.html
@@ -206,7 +206,7 @@
       <svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 96 960 960" fill="currentColor"
         class="absolute transition-all scale-100 rotate-0 dark:-rotate-90 dark:scale-0">
         <path
-          d="M480 685q45.456 0 77.228-31.772Q589 621.456 589 576q0-45.456-31.772-77.228Q525.456 467 480 467q-45.456 0-77.228 31.772Q371 530.544 371 576q0 45.456 31.772 77.228Q434.544 685 480 685Zm0 91q-83 0-141.5-58.5T280 576q0-83 58.5-141.5T480 376q83 0 141.5 58.5T680 576q0 83-58.5 141.5T480 776ZM80 621.5q-19.152 0-32.326-13.174T34.5 576q0-19.152 13.174-32.326T80 530.5h80q19.152 0 32.326 13.174T205.5 576q0 19.152-13.174 32.326T160 621.5H80Zm720 0q-19.152 0-32.326-13.174T754.5 576q0-19.152 13.174-32.326T800 530.5h80q19.152 0 32.326 13.174T925.5 576q0 19.152-13.174 32.326T880 621.5h-80Zm-320-320q-19.152 0-32.326-13.17Q434.5 256.5 434.5 237.338t13.174-33.065q13.435-13.674 32.587-13.674t32.065 13.674l42.239 43q12.674 13.435 12.555 31.706-.12 18.272-12.555 31.946-12.674 13.674-31.445 13.413-18.772-.261-32.446-13.174Zm494 494.761-43-42Q794.609 824.609 794 843.761t-13.174 33.065Q767.391 890.5 748.239 890.5t-32.065-13.674Zm-42-494.761Q660.5 369.391 661 350.62q.5-18.772 13.174-32.446l41.761-43Q728.609 261.5 747.761 262t33.065 13.174q13.674 13.435 13.674 32.587t-13.674 32.065l-43 42.239q-13.435 12.674-31.706 12.555-18.272-.12-31.946-12.555Zm-495 494.761Q165.5 863.391 165.5 844.239t13.674-32.065l43-42.239q13.435-12.674 32.087-12.674t31.565 12.674Q299.5 782.609 299 801.38q-.5 18.772-13.174 32.446l-41.761 43Q231.391 890.5 212.239 890t-33.065-13.174ZM480 576Z" />
+          d="M480 685q45.456 0 77.228-31.772Q589 621.456 589 576q0-45.456-31.772-77.228Q525.456 467 480 467q-45.456 0-77.228 31.772Q371 530.544 371 576q0 45.456 31.772 77.228Q434.544 685 480 685Zm0 91q-83 0-141.5-58.5T280 576q0-83 58.5-141.5T480 376q83 0 141.5 58.5T680 576q0 83-58.5 141.5T480 776ZM80 621.5q-19.152 0-32.326-13.174T34.5 576q0-19.152 13.174-32.326T80 530.5h80q19.152 0 32.326 13.174T205.5 576q0 19.152-13.174 32.326T160 621.5H80Zm720 0q-19.152 0-32.326-13.174T754.5 576q0-19.152 13.174-32.326T800 530.5h80q19.152 0 32.326 13.174T925.5 576q0 19.152-13.174 32.326T880 621.5h-80Zm-320-320q-19.152 0-32.326-13.174T434.5 256v-80q0-19.152 13.174-32.326T480 130.5q19.152 0 32.326 13.174T525.5 176v80q0 19.152-13.174 32.326T480 301.5Zm0 720q-19.152 0-32.326-13.17Q434.5 995.152 434.5 976v-80q0-19.152 13.174-32.326T480 850.5q19.152 0 32.326 13.174T525.5 896v80q0 19.152-13.174 32.33-13.174 13.17-32.326 13.17ZM222.174 382.065l-43-42Q165.5 327.391 166 308.239t13.174-33.065q13.435-13.674 32.587-13.674t32.065 13.674l42.239 43q12.674 13.435 12.555 31.706-.12 18.272-12.555 31.946-12.674 13.674-31.445 13.413-18.772-.261-32.446-13.174Zm494 494.761-42.239-43q-12.674-13.435-12.674-32.087t12.674-31.565Q686.609 756.5 705.38 757q18.772.5 32.446 13.174l43 41.761Q794.5 824.609 794 843.761t-13.174 33.065Q767.391 890.5 748.239 890.5t-32.065-13.674Zm-42-494.761Q660.5 369.391 661 350.62q.5-18.772 13.174-32.446l41.761-43Q728.609 261.5 747.761 262t33.065 13.174q13.674 13.435 13.674 32.587t-13.674 32.065l-43 42.239q-13.435 12.674-31.706 12.555-18.272-.12-31.946-12.555Zm-495 494.761Q165.5 863.391 165.5 844.239t13.674-32.065l43-42.239q13.435-12.674 32.087-12.674t31.565 12.674Q299.5 782.609 299 801.38q-.5 18.772-13.174 32.446l-41.761 43Q231.391 890.5 212.239 890t-33.065-13.174ZM480 576Z" />
       </svg>
       <svg xmlns="http://www.w3.org/2000/svg" height="24" width="24" viewBox="0 96 960 960" fill="currentColor"
         class="absolute transition-all scale-0 rotate-90 dark:rotate-0 dark:scale-100">

From c0d9dd67c7c5d410cb97aa7f02129285682b0c82 Mon Sep 17 00:00:00 2001
From: Joe Thomas <joe@corrindata.com>
Date: Fri, 4 Oct 2024 13:51:37 +0200
Subject: [PATCH 10/20] removed hardcoded tool choice in openai provider in
 favour of a "get" that defaults to "auto"

---
 src/ell/providers/openai.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ell/providers/openai.py b/src/ell/providers/openai.py
index d9c5e084..10db5fac 100644
--- a/src/ell/providers/openai.py
+++ b/src/ell/providers/openai.py
@@ -39,7 +39,7 @@ def translate_to_provider(self, ell_call : EllCallParams) -> Dict[str, Any]:
                 final_call_params.pop("stream_options", None)
             if ell_call.tools:
                 final_call_params.update(
-                    tool_choice="auto",
+                    tool_choice=final_call_params.get("tool_choice", "auto"),
                     tools=[  
                         dict(
                             type="function",

From 221939f7d26093589c987b669274f4508f7401ac Mon Sep 17 00:00:00 2001
From: Arno <bahdaxxzm@gmail.com>
Date: Sat, 5 Oct 2024 12:49:17 +0800
Subject: [PATCH 11/20] use ensure_ascii=False in json.dumps to fix dump
 non-ascii character

ensure_ascii=False
---
 src/ell/lmp/_track.py                           | 2 +-
 src/ell/lmp/tool.py                             | 2 +-
 src/ell/providers/anthropic.py                  | 2 +-
 src/ell/providers/bedrock.py                    | 2 +-
 src/ell/providers/openai.py                     | 2 +-
 src/ell/stores/sql.py                           | 2 +-
 src/ell/types/studio.py                         | 4 +++-
 src/ell/util/serialization.py                   | 6 +++---
 x/openai_realtime/src/openai_realtime/api.py    | 2 +-
 x/openai_realtime/src/openai_realtime/client.py | 4 ++--
 10 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/ell/lmp/_track.py b/src/ell/lmp/_track.py
index 4d2ef43a..0ea8674e 100644
--- a/src/ell/lmp/_track.py
+++ b/src/ell/lmp/_track.py
@@ -219,7 +219,7 @@ def _write_invocation(func, invocation_id, latency_ms, prompt_tokens, completion
         # Write to the blob store 
         blob_id = config.store.blob_store.store_blob(
             json.dumps(invocation_contents.model_dump(
-            ), default=str).encode('utf-8'),
+            ), default=str, ensure_ascii=False).encode('utf-8'),
             invocation_id
         )
         invocation_contents = InvocationContents(
diff --git a/src/ell/lmp/tool.py b/src/ell/lmp/tool.py
index a2be916a..ccdaa8d0 100644
--- a/src/ell/lmp/tool.py
+++ b/src/ell/lmp/tool.py
@@ -54,7 +54,7 @@ def wrapper(
                     elif isinstance(result, list) and all(isinstance(c, ContentBlock) for c in result):
                         content_results = result
                     else:
-                        content_results = [ContentBlock(text=_lstr(json.dumps(result),origin_trace=_invocation_origin))]
+                        content_results = [ContentBlock(text=_lstr(json.dumps(result, ensure_ascii=False),origin_trace=_invocation_origin))]
                 except TypeError as e:
                     raise TypeError(f"Failed to convert tool use result to ContentBlock: {e}. Tools must return json serializable objects. or a list of ContentBlocks.")
                 # XXX: Need to support images and other content types somehow. We should look for images inside of the the result and then go from there.
diff --git a/src/ell/providers/anthropic.py b/src/ell/providers/anthropic.py
index a4ce2816..2002f0ea 100644
--- a/src/ell/providers/anthropic.py
+++ b/src/ell/providers/anthropic.py
@@ -188,7 +188,7 @@ def _content_block_to_anthropic_format(content_block: ContentBlock):
         if (image := content_block.image): return serialize_image_for_anthropic(image)
         elif ((text := content_block.text) is not None): return dict(type="text", text=text)
         elif (parsed := content_block.parsed):
-            return dict(type="text", text=json.dumps(parsed.model_dump()))
+            return dict(type="text", text=json.dumps(parsed.model_dump(), ensure_ascii=False))
         elif (tool_call := content_block.tool_call):
             return dict(
                 type="tool_use",
diff --git a/src/ell/providers/bedrock.py b/src/ell/providers/bedrock.py
index 08f481c0..77bc57c9 100644
--- a/src/ell/providers/bedrock.py
+++ b/src/ell/providers/bedrock.py
@@ -198,7 +198,7 @@ def content_block_to_bedrock_format(content_block: ContentBlock) -> Dict[str, An
     elif content_block.parsed:
         return {
             "type": "text",
-            "text": json.dumps(content_block.parsed.model_dump())
+            "text": json.dumps(content_block.parsed.model_dump(), ensure_ascii=False)
         }
     elif content_block.tool_call:
         return {
diff --git a/src/ell/providers/openai.py b/src/ell/providers/openai.py
index 10db5fac..4f99ccfa 100644
--- a/src/ell/providers/openai.py
+++ b/src/ell/providers/openai.py
@@ -64,7 +64,7 @@ def translate_to_provider(self, ell_call : EllCallParams) -> Dict[str, Any]:
                                 type="function",
                                 function=dict(
                                     name=tool_call.tool.__name__,
-                                    arguments=json.dumps(tool_call.params.model_dump())
+                                    arguments=json.dumps(tool_call.params.model_dump(), ensure_ascii=False)
                                 )
                             ) for tool_call in tool_calls ],
                         role="assistant",
diff --git a/src/ell/stores/sql.py b/src/ell/stores/sql.py
index c96397e1..32d6afd3 100644
--- a/src/ell/stores/sql.py
+++ b/src/ell/stores/sql.py
@@ -21,7 +21,7 @@ class SQLStore(ell.store.Store):
     def __init__(self, db_uri: str, blob_store: Optional[ell.store.BlobStore] = None):
         self.engine = create_engine(db_uri,
                                     json_serializer=lambda obj: json.dumps(pydantic_ltype_aware_cattr.unstructure(obj), 
-                                     sort_keys=True, default=repr))
+                                     sort_keys=True, default=repr, ensure_ascii=False))
         
         SQLModel.metadata.create_all(self.engine)
         self.open_files: Dict[str, Dict[str, Any]] = {}
diff --git a/src/ell/types/studio.py b/src/ell/types/studio.py
index 4ca0468f..da246402 100644
--- a/src/ell/types/studio.py
+++ b/src/ell/types/studio.py
@@ -139,7 +139,9 @@ def should_externalize(self) -> bool:
         ]
         
         total_size = sum(
-            len(json.dumps(field, default=(lambda x: json.dumps(x.model_dump(), default=str) if isinstance(x, BaseModel) else str(x))).encode('utf-8')) for field in json_fields if field is not None
+            len(json.dumps(field, default=(lambda x: json.dumps(x.model_dump(), default=str, ensure_ascii=False)
+                                           if isinstance(x, BaseModel) else str(x)), ensure_ascii=False).encode('utf-8'))
+            for field in json_fields if field is not None
         )
         # print("total_size", total_size)
         
diff --git a/src/ell/util/serialization.py b/src/ell/util/serialization.py
index fbb53a11..855004ca 100644
--- a/src/ell/util/serialization.py
+++ b/src/ell/util/serialization.py
@@ -91,8 +91,8 @@ def handle_complex_types(obj):
 
 
 def compute_state_cache_key(ipstr, fn_closure):
-    _global_free_vars_str = f"{json.dumps(get_immutable_vars(fn_closure[2]), sort_keys=True, default=repr)}"
-    _free_vars_str = f"{json.dumps(get_immutable_vars(fn_closure[3]), sort_keys=True, default=repr)}"
+    _global_free_vars_str = f"{json.dumps(get_immutable_vars(fn_closure[2]), sort_keys=True, default=repr, ensure_ascii=False)}"
+    _free_vars_str = f"{json.dumps(get_immutable_vars(fn_closure[3]), sort_keys=True, default=repr, ensure_ascii=False)}"
     state_cache_key = hashlib.sha256(f"{ipstr}{_global_free_vars_str}{_free_vars_str}".encode('utf-8')).hexdigest()
     return state_cache_key
 
@@ -103,7 +103,7 @@ def prepare_invocation_params(params):
     cleaned_invocation_params = pydantic_ltype_aware_cattr.unstructure(invocation_params)
     
     # Thisis because we wneed the caching to work on the hash of a cleaned and serialized object.
-    jstr = json.dumps(cleaned_invocation_params, sort_keys=True, default=repr)
+    jstr = json.dumps(cleaned_invocation_params, sort_keys=True, default=repr, ensure_ascii=False)
 
     consumes = set()
     import re
diff --git a/x/openai_realtime/src/openai_realtime/api.py b/x/openai_realtime/src/openai_realtime/api.py
index 232bfab6..d9475fd8 100644
--- a/x/openai_realtime/src/openai_realtime/api.py
+++ b/x/openai_realtime/src/openai_realtime/api.py
@@ -77,5 +77,5 @@ def send(self, event_name, data=None):
         self.dispatch("client.*", event)
         self.log("sent:", event_name, event)
         
-        asyncio.create_task(self.ws.send(json.dumps(event)))
+        asyncio.create_task(self.ws.send(json.dumps(event, ensure_ascii=False)))
         return True
\ No newline at end of file
diff --git a/x/openai_realtime/src/openai_realtime/client.py b/x/openai_realtime/src/openai_realtime/client.py
index 3bbfc7b3..0fafb5c1 100644
--- a/x/openai_realtime/src/openai_realtime/client.py
+++ b/x/openai_realtime/src/openai_realtime/client.py
@@ -243,7 +243,7 @@ async def _call_tool(self, tool):
                 'item': {
                     'type': 'function_call_output',
                     'call_id': tool['call_id'],
-                    'output': json.dumps(result)
+                    'output': json.dumps(result, ensure_ascii=False)
                 }
             })
         except Exception as e:
@@ -251,7 +251,7 @@ async def _call_tool(self, tool):
                 'item': {
                     'type': 'function_call_output',
                     'call_id': tool['call_id'],
-                    'output': json.dumps({'error': str(e)})
+                    'output': json.dumps({'error': str(e)}, ensure_ascii=False)
                 }
             })
         self.create_response()
\ No newline at end of file

From b505c243ca65a892cc4fc949e644e94d5d5032e7 Mon Sep 17 00:00:00 2001
From: Reece Holmdahl <rholmdahl@gmail.com>
Date: Wed, 9 Oct 2024 00:08:13 -0500
Subject: [PATCH 12/20] Added config param to specify autocommit_model - can
 specify autocommit_model, defaults to gpt-4o-mini - without explicitly
 setting it, behavior does not change - added test with 2 examples for claude
 3 haiku and gpt 4o mini

---
 src/ell/configurator.py        |  9 +++-
 src/ell/util/differ.py         |  4 +-
 tests/test_autocommit_model.py | 87 ++++++++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 tests/test_autocommit_model.py

diff --git a/src/ell/configurator.py b/src/ell/configurator.py
index 57e281fe..0fe15bdb 100644
--- a/src/ell/configurator.py
+++ b/src/ell/configurator.py
@@ -38,6 +38,7 @@ class Config(BaseModel):
     lazy_versioning: bool = Field(default=True, description="If True, enables lazy versioning for improved performance.")
     default_api_params: Dict[str, Any] = Field(default_factory=dict, description="Default parameters for language models.")
     default_client: Optional[openai.Client] = Field(default=None, description="The default OpenAI client used when a specific model client is not found.")
+    autocommit_model: str = Field(default="gpt-4o-mini", description="When set, changes the default autocommit model from GPT 4o mini.")
     providers: Dict[Type, Provider] = Field(default_factory=dict, description="A dictionary mapping client types to provider classes.")
     def __init__(self, **data):
         super().__init__(**data)
@@ -148,7 +149,8 @@ def init(
     autocommit: bool = True,
     lazy_versioning: bool = True,
     default_api_params: Optional[Dict[str, Any]] = None,
-    default_client: Optional[Any] = None
+    default_client: Optional[Any] = None,
+    autocommit_model: str = "gpt-4o-mini"
 ) -> None:
     """
     Initialize the ELL configuration with various settings.
@@ -165,6 +167,8 @@ def init(
     :type default_api_params: Dict[str, Any], optional
     :param default_openai_client: Set the default OpenAI client.
     :type default_openai_client: openai.Client, optional
+    :param autocommit_model: Set the model used for autocommitting.
+    :type autocommit_model: str
     """
     # XXX: prevent double init
     config.verbose = verbose
@@ -183,6 +187,9 @@ def init(
     if default_client is not None:
         config.default_client = default_client
 
+    if autocommit_model is not None:
+        config.autocommit_model = autocommit_model
+
 # Existing helper functions
 def get_store() -> Union[Store, None]:
     return config.store
diff --git a/src/ell/util/differ.py b/src/ell/util/differ.py
index b2b79625..954d7f0b 100644
--- a/src/ell/util/differ.py
+++ b/src/ell/util/differ.py
@@ -1,9 +1,9 @@
-
+from ell.configurator import config
 from ell.lmp.simple import simple
 import difflib
 
 # Todo: update this for single change stuff so that it doesn't summarize small chage but says it specifically.
-@simple("gpt-4o-mini", temperature=0.2, exempt_from_tracking=True)
+@simple(config.autocommit_model, temperature=0.2, exempt_from_tracking=True, max_tokens=500)
 def write_commit_message_for_diff(old : str, new : str) -> str:
     """You are an expert programmer who's goal is to write commit messages based on diffs. 
 
diff --git a/tests/test_autocommit_model.py b/tests/test_autocommit_model.py
new file mode 100644
index 00000000..d555f8b5
--- /dev/null
+++ b/tests/test_autocommit_model.py
@@ -0,0 +1,87 @@
+import ell
+from ell.configurator import config
+import anthropic
+
+ell.init(verbose=True, autocommit_model="gpt-4o-mini")
+# ell.init(verbose=True, autocommit_model="claude-3-haiku-20240307")
+
+test1_v1 = '''import ell
+import numpy as np
+
+@ell.simple(model="gpt-4o-mini")
+def come_up_with_a_premise_for_a_joke_about(topic : str):
+    """You are an incredibly funny comedian. Come up with a premise for a joke about topic"""
+    return f"come up with a premise for a joke about {topic}"
+
+def get_random_length():
+    return int(np.random.beta(2, 5) * 300)
+
+@ell.simple(model="gpt-4o-mini")
+def joke(topic : str):
+    """You are a funny comedian. You respond in scripts for a standup comedy skit."""
+    return f"Act out a full joke. Make your script {get_random_length()} words long. Here's the premise: {come_up_with_a_premise_for_a_joke_about(topic)}"'''
+
+test1_v2 = '''import ell
+import numpy as np
+
+@ell.simple(model="gpt-4o-mini")
+def come_up_with_a_premise_for_a_joke_about(topic : str):
+    """You are an incredibly funny comedian. Come up with a premise for a joke about topic"""
+    return f"come up with a premise for a joke about {topic}"
+
+def get_random_length():
+    return int(np.random.beta(2, 5) * 200)
+
+@ell.simple(model="gpt-4o-mini")
+def joke(topic : str):
+    """You are a funny comedian. You respond in scripts for skits."""
+    return f"Act out a full joke. Make your script {get_random_length()} words long. Here's the premise: {come_up_with_a_premise_for_a_joke_about(topic)}"'''
+
+test2_v1 = """CHORD_FORMAT = "| Chord | Chord | ... |"
+
+@ell.simple(model="gpt-4o", temperature=0.5)
+def write_a_chord_progression_for_song(genre: Optional[str], key : Optional[str]) :
+    return [
+        ell.system(f"You are a world class music theorist and composer. Your goal is to write chord progressions to songs given parameters. They should be fully featured and compositionally sound. Feel free to use advanced chords of your choosing. Only answer with the chord progression in {CHORD_FORMAT} format. Do not provide any additional text. Feel free to occaisonally use 13 chrods and complex chords if necessary etc."),
+        ell.user(f"Write a chord progression for a song {'in ' + genre if genre else ''} {'in the key of ' + key if key else ''}.")
+
+    ]"""
+
+test2_v2 = """CHORD_FORMAT = "| Chord | Chord | ... |"
+
+@ell.simple(model="gpt-4o", temperature=0.7)
+def write_a_chord_progression_for_song(genre: Optional[str], key : Optional[str]) :
+    return [
+        ell.system(f"You are a world-renowned class music theorist and composer. Your goal is to write chord progressions for a song given a genre or key. They should be fully featured and compositionally sound. Feel free to use advanced chords of your choosing. Only answer with the chord progression in {CHORD_FORMAT} format. Do not provide any additional text. Feel free to occaisonally use 13 chrods and complex chords if necessary etc."),
+        ell.user(f"Write a chord progression for a song {'in ' + genre if genre else ''} {'in the key of ' + key if key else ''}.")
+
+    ]"""
+
+from ell.util.differ import write_commit_message_for_diff
+
+# test 1
+(response, *args) = write_commit_message_for_diff(test1_v1, test1_v2)
+print(response)
+
+# test 2
+(response, *args) = write_commit_message_for_diff(test2_v1, test2_v2)
+print(response)
+
+### CLAUDE HAIKU ###
+# Decrease maximum length of joke scripts from 300 to 200 words:
+# * The `get_random_length` function was updated to return a length between 200 instead of 300 words.
+# * The system prompt in the `joke` function was changed to "You are a funny comedian. You respond in scripts for skits." from "You are a funny comedian. You respond in scripts for a standup comedy skit."
+
+# Increase temperature and expand system prompt in `write_a_chord_progression_for_song` function:
+# * The `temperature` parameter in the `@ell.simple` decorator was increased from 0.5 to 0.7
+# * The system prompt in `write_a_chord_progression_for_song` was expanded to describe the function as "a world-renowned class music theorist and composer" instead of just "a world class music theorist and composer"
+
+### GPT 4o MINI ###
+# Update `get_random_length` multiplier and shorten `joke` system prompt:
+# * Changed the multiplier in `get_random_length` from 300 to 200.
+# * Shortened the system prompt in `joke` from "You respond in scripts for a standup comedy skit." to "You respond in scripts for skits."
+
+# Update system prompt and temperature in `write_a_chord_progression_for_song` function:
+# * Changed "world class" to "world-renowned" in the system prompt.
+# * Updated the temperature from 0.5 to 0.7.
+# * Modified the phrase "to write chord progressions to songs given parameters" to "to write chord progressions for a song given a genre or key" in the system prompt.
\ No newline at end of file

From 560bcfe5d47c83e78b2e424186eb76f07ca35527 Mon Sep 17 00:00:00 2001
From: Reece Holmdahl <rholmdahl@gmail.com>
Date: Wed, 9 Oct 2024 00:31:47 -0500
Subject: [PATCH 13/20] Fixed diff, updated `write_commit_message_for_diff`
 prompt: * diff in `differ.py` returned a generator, not a string. fixed by
 joining with newline * rewrote using some of Anthropic's prompting best
 practices * much more consistent results from Claude 3 haiku using this
 prompt

---
 src/ell/util/differ.py         | 46 ++++++++++++--------
 tests/test_autocommit_model.py | 77 ++++++++++++++++++++++++++--------
 2 files changed, 88 insertions(+), 35 deletions(-)

diff --git a/src/ell/util/differ.py b/src/ell/util/differ.py
index 954d7f0b..212adf96 100644
--- a/src/ell/util/differ.py
+++ b/src/ell/util/differ.py
@@ -5,38 +5,48 @@
 # Todo: update this for single change stuff so that it doesn't summarize small chage but says it specifically.
 @simple(config.autocommit_model, temperature=0.2, exempt_from_tracking=True, max_tokens=500)
 def write_commit_message_for_diff(old : str, new : str) -> str:
-    """You are an expert programmer who's goal is to write commit messages based on diffs. 
-
-You will be given two version of source code. 
-You will be expected to write a commit message that describes the changes between the two versions. Your commit message should be at most one sentence and highly specific to the changes made. Don't just discuss the functions changed but how they were specifically changed.
-Your commit message cannot be more than 10 words so use sentence fragments and be concise.
-The @ell.simple decorator turns a function into a call to a language model: 
-    the docstring is the system prompt and the string returned in the user prompt. 
-It is extremely important that if these are change: your commit message must say what specifically changed in the user or system prompt rather than saying they were updated or changed geneircally.
-It is extremely important that you never refer to a @ell.simple docstring as a docstring; it is a system prompt. 
-Don't say why a change was done but what specifically changed.
-Consider all changes ot the program including the globals and free variables
-Respond in the following format:
-<commit_message summarizing all changes with specificity>:
-<* bulleted list of all changes>."""
+    """You are an expert programmer whose goal is to write commit messages based on diffs.
+You will be given two version of source code and their unified diff.
+You will be expected to write a commit message that describes the changes between the two versions.
+
+Follow these guidelines:
+1. Your commit message should be at most one sentence and highly specific to the changes made. Don't just discuss the functions changed but how they were specifically changed.
+2. Your commit message cannot be more than 10 words so use sentence fragments and be concise.
+3. The @ell.simple decorator turns a function into a call to a language model program: the function's docstring is the system prompt and the string returned is the user prompt. 
+4. It is extremely important that if the system prompt or user prompt changes, your commit message must say what specifically changed, rather than vaguely saying they were updated or changed.
+5. It is extremely important that you never refer to a @ell.simple docstring as a docstring: it is a system prompt. 
+6. Do NOT say why a change was done, say what specifically changed.
+7. Consider all changes ot the program including the globals and free variables
+
+Example response:
+'''
+Update model temperature and refine system prompt wording:
+* Changed temperature from 0.5 to 0.7.
+* Updated "with specificity, brevity, and good grammar" to "clearly and concisely" in system prompt.
+* The `questions` param was assigned type List[Question]
+'''
+Response format:
+<Short commit message summarizing all the changes with specificity>:
+* <Bulleted list of each specific change>.
+"""
     clean_program_of_all_bv_tags = lambda program : program.replace("#<BV>", "").replace("#</BV>", "").replace("#<BmV>", "").replace("#</BmV>", "")
     old_clean = clean_program_of_all_bv_tags(old)
     new_clean = clean_program_of_all_bv_tags(new)
 
-    diff = difflib.unified_diff(old_clean.splitlines(), new_clean.splitlines(), lineterm='')
+    diff = "\n".join(difflib.unified_diff(old_clean.splitlines(), new_clean.splitlines(), lineterm=''))
 
     return f"""Write a commit message succinctly and specifically describing the changes between these two versions of a program.
-OLD VERISON:
+Old version:
 ```
 {old_clean}
 ```
 
-NEW VERSION:
+New version:
 ```
 {new_clean}
 ```
 
-DIFF:
+Unified diff:
 {diff}
 """
 
diff --git a/tests/test_autocommit_model.py b/tests/test_autocommit_model.py
index d555f8b5..bfdc6315 100644
--- a/tests/test_autocommit_model.py
+++ b/tests/test_autocommit_model.py
@@ -42,7 +42,7 @@ def joke(topic : str):
 @ell.simple(model="gpt-4o", temperature=0.5)
 def write_a_chord_progression_for_song(genre: Optional[str], key : Optional[str]) :
     return [
-        ell.system(f"You are a world class music theorist and composer. Your goal is to write chord progressions to songs given parameters. They should be fully featured and compositionally sound. Feel free to use advanced chords of your choosing. Only answer with the chord progression in {CHORD_FORMAT} format. Do not provide any additional text. Feel free to occaisonally use 13 chrods and complex chords if necessary etc."),
+        ell.system(f"You are a world class music theorist and composer. Your goal is to write chord progressions to songs given parameters. They should be fully featured and compositionally sound. Feel free to use advanced chords of your choosing. Only answer with the chord progression in {CHORD_FORMAT} format. Do not provide any additional text. Feel free to occaisonally use 13 chords and complex chords if necessary etc."),
         ell.user(f"Write a chord progression for a song {'in ' + genre if genre else ''} {'in the key of ' + key if key else ''}.")
 
     ]"""
@@ -52,7 +52,7 @@ def write_a_chord_progression_for_song(genre: Optional[str], key : Optional[str]
 @ell.simple(model="gpt-4o", temperature=0.7)
 def write_a_chord_progression_for_song(genre: Optional[str], key : Optional[str]) :
     return [
-        ell.system(f"You are a world-renowned class music theorist and composer. Your goal is to write chord progressions for a song given a genre or key. They should be fully featured and compositionally sound. Feel free to use advanced chords of your choosing. Only answer with the chord progression in {CHORD_FORMAT} format. Do not provide any additional text. Feel free to occaisonally use 13 chrods and complex chords if necessary etc."),
+        ell.system(f"You are a world-renowned class music theorist and composer. Your goal is to write chord progressions for a song given a genre or key. They should be fully featured and compositionally sound. Feel free to use advanced chords of your choosing. Only answer with the chord progression in {CHORD_FORMAT} format. Do not provide any additional text. Feel free to occaisonally use 13 chords and complex chords if necessary etc."),
         ell.user(f"Write a chord progression for a song {'in ' + genre if genre else ''} {'in the key of ' + key if key else ''}.")
 
     ]"""
@@ -67,21 +67,64 @@ def write_a_chord_progression_for_song(genre: Optional[str], key : Optional[str]
 (response, *args) = write_commit_message_for_diff(test2_v1, test2_v2)
 print(response)
 
-### CLAUDE HAIKU ###
-# Decrease maximum length of joke scripts from 300 to 200 words:
-# * The `get_random_length` function was updated to return a length between 200 instead of 300 words.
-# * The system prompt in the `joke` function was changed to "You are a funny comedian. You respond in scripts for skits." from "You are a funny comedian. You respond in scripts for a standup comedy skit."
+### --BEFORE PROMPT CHANGES-- ###
+
+### CLAUDE 3 HAIKU ###
+# Test 1:
+# Reduced maximum script length in `get_random_length()` function:
+# * The maximum script length returned by `get_random_length()` was reduced from 300 to 200 words.
+# * The system prompt for the `joke()` function was updated to remove the word "standup comedy".
+#
+# <Reduced maximum script length in `get_random_length()` function, updated system prompt for `joke()` function>:
+# * Decreased the maximum script length returned by `get_random_length()` from 300 to 200 words.
+# * Removed the phrase "standup comedy" from the system prompt for the `joke()` function.
+
+# Test 2:
+# Increased temperature in @ell.simple decorator from 0.5 to 0.7:
+# * Changed the temperature parameter in the @ell.simple decorator from 0.5 to 0.7.
+# * Updated the system prompt to describe the music theorist and composer as "world-renowned" instead of "world class".
+#
+# <commit_message summarizing all changes with specificity>:
+# Increased temperature in @ell.simple decorator from 0.5 to 0.7, updated system prompt description.
+#
+# * Changed the temperature parameter in the @ell.simple decorator from 0.5 to 0.7.
+# * Updated the system prompt to describe the music theorist and composer as "world-renowned" instead of "world class".
 
-# Increase temperature and expand system prompt in `write_a_chord_progression_for_song` function:
-# * The `temperature` parameter in the `@ell.simple` decorator was increased from 0.5 to 0.7
-# * The system prompt in `write_a_chord_progression_for_song` was expanded to describe the function as "a world-renowned class music theorist and composer" instead of just "a world class music theorist and composer"
+### GPT 4o MINI ###
+# Test 1:
+# Reduce script length to 200 words and update skit prompt:  
+# * Changed `get_random_length` to return 200 instead of 300.  
+# * Updated the system prompt in `joke` to specify "scripts for skits" instead of "scripts for a standup comedy skit."
+
+# Test 2:
+# Update model temperature and refine system prompt wording:
+# * Changed temperature from 0.5 to 0.7.
+# * Updated "world class" to "world-renowned class" in system prompt.
+# * Changed "to write chord progressions to songs given parameters" to "to write chord progressions for a song given a genre or key" in system prompt.
+
+
+### --AFTER PROMPT CHANGES-- ###
+
+### CLAUDE 3 HAIKU ###
+# Test 1:
+# Reduce maximum script length and simplify system prompt for joke function:
+# * Changed `get_random_length()` to return a maximum script length of 200 words, down from 300.
+# * Updated the system prompt for the `joke()` function to say "You are a funny comedian. You respond in scripts for skits." instead of "You are a funny comedian. You respond in scripts for a standup comedy skit."
+
+# Test 2:
+# Increase model temperature and refine system prompt wording:
+# * Changed temperature from 0.5 to 0.7.
+# * Updated "world class music theorist and composer" to "world-renowned class music theorist and composer" in system prompt.
+# * Changed "write chord progressions to songs given parameters" to "write chord progressions for a song given a genre or key" in system prompt.
 
 ### GPT 4o MINI ###
-# Update `get_random_length` multiplier and shorten `joke` system prompt:
-# * Changed the multiplier in `get_random_length` from 300 to 200.
-# * Shortened the system prompt in `joke` from "You respond in scripts for a standup comedy skit." to "You respond in scripts for skits."
-
-# Update system prompt and temperature in `write_a_chord_progression_for_song` function:
-# * Changed "world class" to "world-renowned" in the system prompt.
-# * Updated the temperature from 0.5 to 0.7.
-# * Modified the phrase "to write chord progressions to songs given parameters" to "to write chord progressions for a song given a genre or key" in the system prompt.
\ No newline at end of file
+# Test 1:
+# Reduce script length and modify system prompt wording:
+# * Changed `get_random_length` to return 200 instead of 300.
+# * Updated system prompt from "scripts for a standup comedy skit" to "scripts for skits."
+
+# Test 2:
+# Update temperature and refine system prompt details:
+# * Changed temperature from 0.5 to 0.7.
+# * Updated "world class" to "world-renowned" in system prompt.
+# * Changed "write chord progressions to songs given parameters" to "write chord progressions for a song given a genre or key" in system prompt.
\ No newline at end of file

From 70d6a5e47191af3aa52d4990977088a2b84b7216 Mon Sep 17 00:00:00 2001
From: Alex Dixon <alex.dixon@embeddedinsurance.com>
Date: Fri, 11 Oct 2024 06:29:41 -0700
Subject: [PATCH 14/20] fix: skip db watcher when postgres

---
 src/ell/studio/__main__.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/ell/studio/__main__.py b/src/ell/studio/__main__.py
index 5056d09a..4cb80950 100644
--- a/src/ell/studio/__main__.py
+++ b/src/ell/studio/__main__.py
@@ -48,9 +48,6 @@ def main():
     if args.dev:
         assert args.port == 5555, "Port must be 5000 in development mode"
 
-    if not args.storage_dir:
-        logger.warning("WARNING: Using current directory as the storage dir, pass --storage-dir to change this.")
-
     config = Config.create(storage_dir=args.storage_dir,
                     pg_connection_string=args.pg_connection_string)
     app = create_app(config)
@@ -69,7 +66,7 @@ async def serve_react_app(full_path: str):
                 return FileResponse(static_dir / "index.html")
 
     # Respect Config.create behavior, which has fallback to env vars.
-    db_path = Path(config.storage_dir)
+    db_path = Path(config.storage_dir) if config.storage_dir else None
 
     async def db_watcher(db_path, app):
         last_stat = None
@@ -126,7 +123,8 @@ async def open_browser(host, port):
     config = uvicorn.Config(app=app, host=args.host, port=args.port, loop=loop)
     server = uvicorn.Server(config)
     loop.create_task(server.serve())
-    loop.create_task(db_watcher(db_path, app))
+    if db_path:
+        loop.create_task(db_watcher(db_path, app))
     if args.open:
         loop.create_task(open_browser(args.host, args.port))
     loop.run_forever()

From af16584756edd6c82778dfb0bf491fb05b85dd4d Mon Sep 17 00:00:00 2001
From: William Guss <carlostnb@gmail.com>
Date: Sat, 12 Oct 2024 16:07:06 -0700
Subject: [PATCH 15/20] remove autocommit

---
 tests/test_autocommit_model.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/tests/test_autocommit_model.py b/tests/test_autocommit_model.py
index bfdc6315..725b8fe2 100644
--- a/tests/test_autocommit_model.py
+++ b/tests/test_autocommit_model.py
@@ -2,9 +2,6 @@
 from ell.configurator import config
 import anthropic
 
-ell.init(verbose=True, autocommit_model="gpt-4o-mini")
-# ell.init(verbose=True, autocommit_model="claude-3-haiku-20240307")
-
 test1_v1 = '''import ell
 import numpy as np
 
@@ -57,17 +54,23 @@ def write_a_chord_progression_for_song(genre: Optional[str], key : Optional[str]
 
     ]"""
 
-from ell.util.differ import write_commit_message_for_diff
 
-# test 1
-(response, *args) = write_commit_message_for_diff(test1_v1, test1_v2)
-print(response)
+import os
+
+if os.environ.get("OPENAI_API_KEY"):
+    from ell.util.differ import write_commit_message_for_diff
+    ell.init(verbose=True, autocommit_model="gpt-4o-mini")
+    # ell.init(verbose=True, autocommit_model="claude-3-haiku-20240307")
+    def test_commit_message_1():
+        # test 1
+        (response, *args) = write_commit_message_for_diff(test1_v1, test1_v2)
+        print(response)
 
-# test 2
-(response, *args) = write_commit_message_for_diff(test2_v1, test2_v2)
-print(response)
+        # test 2
+        (response, *args) = write_commit_message_for_diff(test2_v1, test2_v2)
+        print(response)
 
-### --BEFORE PROMPT CHANGES-- ###
+    ### --BEFORE PROMPT CHANGES-- ###
 
 ### CLAUDE 3 HAIKU ###
 # Test 1:

From d1f343f7c1d40b0d560b01998fd97794ee9a90f5 Mon Sep 17 00:00:00 2001
From: William Guss <carlostnb@gmail.com>
Date: Sat, 12 Oct 2024 16:15:23 -0700
Subject: [PATCH 16/20] xai support

---
 src/ell/models/xai.py | 66 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 src/ell/models/xai.py

diff --git a/src/ell/models/xai.py b/src/ell/models/xai.py
new file mode 100644
index 00000000..dad54379
--- /dev/null
+++ b/src/ell/models/xai.py
@@ -0,0 +1,66 @@
+"""
+This module handles the registration of OpenAI models within the ell framework.
+
+It provides functionality to register various OpenAI models with a given OpenAI client,
+making them available for use throughout the system. The module also sets up a default
+client behavior for unregistered models.
+
+Key features:
+1. Registration of specific OpenAI models with their respective types (system, openai, openai-internal).
+2. Utilization of a default OpenAI client for any unregistered models,
+
+The default client behavior ensures that even if a specific model is not explicitly
+registered, the system can still attempt to use it with the default OpenAI client.
+This fallback mechanism provides flexibility in model usage while maintaining a
+structured approach to model registration.
+
+Note: The actual model availability may depend on your OpenAI account's access and the
+current offerings from OpenAI.
+
+Additionally, due to the registration of default mdoels, the OpenAI client may be used for
+anthropic, cohere, groq, etc. models if their clients are not registered or fail
+to register due to an error (lack of API keys, rate limits, etc.)
+"""
+
+import os
+from ell.configurator import config
+import openai
+
+import logging
+import colorama
+
+logger = logging.getLogger(__name__)
+
+def register(client: openai.Client):
+    """
+    Register OpenAI models with the provided client.
+
+    This function takes an OpenAI client and registers various OpenAI models
+    with the global configuration. It allows the system to use these models
+    for different AI tasks.
+
+    Args:
+        client (openai.Client): An instance of the OpenAI client to be used
+                                for model registration.
+
+    Note:
+        The function doesn't return anything but updates the global
+        configuration with the registered models.
+    """
+    standard_models = [
+    'grok-2-mini',
+    'grok-2',
+    'grok-2-mini-public',
+    'grok-2-public',
+    ]
+    for model_id in standard_models:
+        config.register_model(model_id, client)
+
+default_client = None
+try:
+    default_client = openai.Client(base_url="https://api.x.ai/v1", api_key=os.environ.get("XAI_API_KEY"))
+except openai.OpenAIError as e:
+    pass
+
+register(default_client)
+config.default_client = default_client
\ No newline at end of file

From c8022484006c45a7ed744995f20679028102a0ef Mon Sep 17 00:00:00 2001
From: William Guss <carlostnb@gmail.com>
Date: Sat, 12 Oct 2024 16:15:58 -0700
Subject: [PATCH 17/20] automatic support

---
 src/ell/models/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ell/models/__init__.py b/src/ell/models/__init__.py
index f57479de..0bfc2d55 100644
--- a/src/ell/models/__init__.py
+++ b/src/ell/models/__init__.py
@@ -10,4 +10,5 @@
 import ell.models.anthropic
 import ell.models.ollama
 import ell.models.groq
-import ell.models.bedrock
\ No newline at end of file
+import ell.models.bedrock
+import ell.models.xai
\ No newline at end of file

From ed6f21a889198a538ba57d244b669223b6d51f0a Mon Sep 17 00:00:00 2001
From: William Guss <carlostnb@gmail.com>
Date: Sat, 12 Oct 2024 16:18:36 -0700
Subject: [PATCH 18/20] XAI example.

---
 examples/providers/xai_ex.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 examples/providers/xai_ex.py

diff --git a/examples/providers/xai_ex.py b/examples/providers/xai_ex.py
new file mode 100644
index 00000000..aa9e7e09
--- /dev/null
+++ b/examples/providers/xai_ex.py
@@ -0,0 +1,21 @@
+import ell
+import openai
+import os
+
+ell.init(verbose=True)
+
+# Models are automatically registered, so we can use them without specifying the client
+@ell.simple(model='grok-2-mini')
+def use_default_xai_client(prompt: str) -> str:
+    return prompt
+
+print(use_default_xai_client("Tell me a joke, Grok!"))
+
+
+# If you want to use a custom client you can.
+# Custom client for X.AI
+xai_client = openai.Client(base_url="https://api.x.ai/v1", api_key=your_api_key)
+
+@ell.simple(model='grok-2', client=xai_client)
+def chat_xai(prompt: str) -> str:
+    return prompt
\ No newline at end of file

From e7e7b3d105c1b4bb517bcf1efeab3ac5e83283f3 Mon Sep 17 00:00:00 2001
From: William Guss <carlostnb@gmail.com>
Date: Sat, 12 Oct 2024 16:58:53 -0700
Subject: [PATCH 19/20] v0.0.14

---
 examples/bedrock_hello.py         | 57 -----------------------------
 examples/future/limbo.py          |  4 +--
 examples/openai_audio.py          | 19 +++++-----
 examples/openai_prompt_caching.py |  3 ++
 examples/providers/xai_ex.py      |  1 +
 pyproject.toml                    |  3 +-
 src/ell/models/xai.py             |  7 +++-
 tests/.exampleignore              |  9 ++++-
 tests/run_all_examples.py         | 60 +++++++++++++++++++++----------
 9 files changed, 72 insertions(+), 91 deletions(-)
 delete mode 100644 examples/bedrock_hello.py

diff --git a/examples/bedrock_hello.py b/examples/bedrock_hello.py
deleted file mode 100644
index b2608237..00000000
--- a/examples/bedrock_hello.py
+++ /dev/null
@@ -1,57 +0,0 @@
-import ell
-from PIL import Image
-from ell.providers.bedrock import BedrockProvider
-from pydantic import BaseModel, Field
-import anthropic
-from typing import List
-import ell
-from ell.types import Message
-import boto3
-
-@ell.simple(model="anthropic.claude-3-haiku-20240307-v1:0", api_params={"stream":True}, client=boto3.client('bedrock-runtime', region_name='us-east-1'))
-def hello_from_bedrock_streaming():
-    """You are an AI assistant. Your task is to respond to the user's message with a friendly greeting."""
-    return "Say hello to the world!!!"
-
-@ell.simple(model="anthropic.claude-3-haiku-20240307-v1:0", client=boto3.client('bedrock-runtime', region_name='us-east-1'))
-def hello_from_bedrock():
-    """You are an AI assistant. Your task is to respond to the user's message with a friendly greeting."""
-    return "Say hello to the world!!!"
-
-@ell.simple(model="anthropic.claude-3-haiku-20240307-v1:0", client=boto3.client('bedrock-runtime', region_name='us-east-1'))
-def describe_activity(image: Image.Image):
-    return [
-        ell.system("You are VisionGPT. Answer <5 words all lower case."),
-        ell.user(["Describe what the person in the image is doing:", image])
-    ]
-
-
-@ell.tool()
-def approve_claim(claim_id : str):
-    """Approve a claim"""
-    return f"approved {claim_id}"
-
-@ell.complex(model="anthropic.claude-3-haiku-20240307-v1:0", tools=[approve_claim], client=boto3.client('bedrock-runtime', region_name='us-east-1'))
-def insurance_claim_chatbot(message_history: str) -> str:
-    """You are an insurance claim approver. You can use a tool to approve a claim if an id is given to you."""
-    return message_history
-
-
-if __name__ == "__main__":
-    ell.init(verbose=True, store="./logdir", autocommit=True)
-    hello_from_bedrock_streaming()
-    hello_from_bedrock()
-    # Capture an image from the webcam
-    describe_activity(Image.open(r"./examples/future/catmeme.jpg")) # "they are holding a book"
-
-    message_history = []
-
-    # Run through messages automatically!
-    user_messages = "Please approve the claim 12344534"
-
-    response_message = insurance_claim_chatbot(user_messages)
-    print(response_message)
-    if response_message.tool_calls:
-        tool_results = response_message.call_tools_and_collect_as_message()
-        print(tool_results)
-    print('THE END')
\ No newline at end of file
diff --git a/examples/future/limbo.py b/examples/future/limbo.py
index 06a76ab1..9e6e42e8 100644
--- a/examples/future/limbo.py
+++ b/examples/future/limbo.py
@@ -7,8 +7,8 @@
 ell.init(verbose=True, store='./logdir', autocommit=True)
 
 
-@ell.tool(autogenerate=True)
-def order_t_shirt(size, color, address):
+@ell.tool()
+def order_t_shirt(size : str, color : str, address : str):
     
     # ....\
     pass
diff --git a/examples/openai_audio.py b/examples/openai_audio.py
index 469775c5..117b1bbe 100644
--- a/examples/openai_audio.py
+++ b/examples/openai_audio.py
@@ -1,15 +1,14 @@
-import ell
+# import ell
 
 
-ell.init(verbose=True)
+# # ell.init(verbose=True)
 
-@ell.complex("gpt-4o-audio-preview")
-def test():
-    return [ell.user("Hey! Could you talk to me in spanish? I'd like to hear how you say 'ell'.")]
+# # @ell.complex("gpt-4o-audio-preview")
+# # def test():
+# #     return [ell.user("Hey! Could you talk to me in spanish? I'd like to hear how you say 'ell'.")]
 
-response = test()
-print(response.audios[0])
-
-if __name__ == "__main__":
-    test()
+if __name__ == "__main__":    
+#     # response = test()
+#     # print(response.audios[0])
+    pass
 
diff --git a/examples/openai_prompt_caching.py b/examples/openai_prompt_caching.py
index 170fda83..b7bf662e 100644
--- a/examples/openai_prompt_caching.py
+++ b/examples/openai_prompt_caching.py
@@ -13,6 +13,9 @@ def cached_chat(history : List[str], new_message : str) -> str:
 
 
 
+if __name__ == "__main__":
+    pass
+
 
 
 
diff --git a/examples/providers/xai_ex.py b/examples/providers/xai_ex.py
index aa9e7e09..bee67cc9 100644
--- a/examples/providers/xai_ex.py
+++ b/examples/providers/xai_ex.py
@@ -5,6 +5,7 @@
 ell.init(verbose=True)
 
 # Models are automatically registered, so we can use them without specifying the client
+# set XAI_API_KEY=your_api_key in your environment to run this example
 @ell.simple(model='grok-2-mini')
 def use_default_xai_client(prompt: str) -> str:
     return prompt
diff --git a/pyproject.toml b/pyproject.toml
index 762fe02b..48e14a49 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ell-ai"
-version = "0.0.13"
+version = "0.0.14"
 description = "ell - the language model programming library"
 authors = ["William Guss <will@lrsys.xyz>"]
 license = "MIT"
@@ -41,6 +41,7 @@ requests = "^2.32.3"
 typing-extensions = "^4.12.2"
 black = "^24.8.0"
 pillow = "^10.4.0"
+psutil = "^5.9.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.2"
diff --git a/src/ell/models/xai.py b/src/ell/models/xai.py
index dad54379..6f3d891a 100644
--- a/src/ell/models/xai.py
+++ b/src/ell/models/xai.py
@@ -56,9 +56,14 @@ def register(client: openai.Client):
     for model_id in standard_models:
         config.register_model(model_id, client)
 
+
 default_client = None
 try:
-    default_client = openai.Client(base_url="https://api.x.ai/v1", api_key=os.environ.get("XAI_API_KEY"))
+
+    xai_api_key = os.environ.get("XAI_API_KEY")
+    if not xai_api_key:
+        raise openai.OpenAIError("XAI_API_KEY not found in environment variables")
+    default_client = openai.Client(base_url="https://api.x.ai/v1", api_key=xai_api_key)
 except openai.OpenAIError as e:
     pass
 
diff --git a/tests/.exampleignore b/tests/.exampleignore
index 10d790d4..f77107cb 100644
--- a/tests/.exampleignore
+++ b/tests/.exampleignore
@@ -6,4 +6,11 @@ webcam_activity_describer.py
 openaigym.py
 o1.py
 chord*
-server_example.py
\ No newline at end of file
+server_example.py
+limbo.py
+providers/bedrock_ex.py
+azure_ex.py
+openrouter_ex.py
+vllm_ex.py
+*_ex.py
+bedrock_hello.py
\ No newline at end of file
diff --git a/tests/run_all_examples.py b/tests/run_all_examples.py
index 200659f8..b87e0331 100644
--- a/tests/run_all_examples.py
+++ b/tests/run_all_examples.py
@@ -2,14 +2,15 @@
 import subprocess
 import sys
 import time
-from concurrent.futures import ThreadPoolExecutor, as_completed
+from concurrent.futures import ThreadPoolExecutor, as_completed, TimeoutError
 import logging
-from colorama import Fore, Style, init
+from colorama import Fore, Style, init  # type: ignore
 import argparse
 import json
 import hashlib
 import fnmatch
 import threading
+import psutil
 
 # Initialize colorama for cross-platform colored output
 init()
@@ -63,7 +64,6 @@ def run_example(example_path, verbose=False, cache=None):
         # Prepare simulated input based on the example file
         simulated_input = get_simulated_input(filename)
         
-        # Run the example with simulated input
         process = subprocess.Popen(
             [sys.executable, example_path],
             stdin=subprocess.PIPE,
@@ -71,12 +71,28 @@ def run_example(example_path, verbose=False, cache=None):
             stderr=subprocess.PIPE,
             text=True
         )
-        
-        stdout, stderr = process.communicate(input=simulated_input)
-        
+
+        def kill_proc_tree(pid):
+            parent = psutil.Process(pid)
+            for child in parent.children(recursive=True):
+                child.kill()
+            parent.kill()
+
+        try:
+            stdout, stderr = process.communicate(input=simulated_input, timeout=60)
+        except subprocess.TimeoutExpired:
+            kill_proc_tree(process.pid)
+            return filename, "TIMEOUT", 60, "Example execution timed out after 60 seconds", ""
+
         end_time = time.time()
         runtime = end_time - start_time
         
+        if process.returncode != 0:
+            error_message = f"Process exited with non-zero status: {process.returncode}\nStderr: {stderr}"
+            if cache is not None:
+                update_cache(cache, file_hash, "ERROR", runtime)
+            return filename, "ERROR", runtime, error_message, stdout
+
         if cache is not None:
             update_cache(cache, file_hash, "SUCCESS", runtime)
         return filename, "SUCCESS", runtime, None, stdout
@@ -146,18 +162,21 @@ def run_all_examples(args):
                 print(f"{Fore.GREEN}{futures[future]} . (Runtime: {runtime:.2f}s){Style.RESET_ALL}")
             elif status == "CACHED":
                 print(f"{Fore.BLUE}{futures[future]} C (Cached Runtime: {runtime:.2f}s){Style.RESET_ALL}")
+            elif status == "TIMEOUT":
+                print(f"{Fore.YELLOW}{futures[future]} T (Timeout: {runtime:.2f}s){Style.RESET_ALL}")
+                print(f"  Error: {error}")
             else:
                 print(f"{Fore.RED}{futures[future]} F (Runtime: {runtime:.2f}s){Style.RESET_ALL}")
                 print(f"  Error: {error}")
                 print(f"  Full output:")
                 print(output)
-                if not args.continue_on_error:
-                    print(f"\n{Fore.RED}Stopping execution due to failure.{Style.RESET_ALL}")
-                    for running_future in futures:
-                        if not running_future.done():
-                            print(f"{Fore.YELLOW}Cancelling: {futures[running_future]}{Style.RESET_ALL}")
-                    executor.shutdown(wait=False, cancel_futures=True)
-                    break
+            if status in ["ERROR", "TIMEOUT"] and not args.continue_on_error:
+                print(f"\n{Fore.RED}Stopping execution due to failure.{Style.RESET_ALL}")
+                for running_future in futures:
+                    if not running_future.done():
+                        print(f"{Fore.YELLOW}Cancelling: {futures[running_future]}{Style.RESET_ALL}")
+                executor.shutdown(wait=False, cancel_futures=True)
+                break
 
     if args.cache:
         save_cache(cache)
@@ -166,18 +185,21 @@ def run_all_examples(args):
     total_examples = len(results)
     successful = sum(1 for _, status, _, _ in results if status in {"SUCCESS", "CACHED"})
     failed = sum(1 for _, status, _, _ in results if status == "ERROR")
-    skipped = total_examples - successful - failed
+    timed_out = sum(1 for _, status, _, _ in results if status == "TIMEOUT")
+    skipped = total_examples - successful - failed - timed_out
 
     print(f"Total examples: {total_examples}")
     print(f"{Fore.GREEN}Successful: {successful}{Style.RESET_ALL}")
     print(f"{Fore.RED}Failed: {failed}{Style.RESET_ALL}")
+    print(f"{Fore.YELLOW}Timed out: {timed_out}{Style.RESET_ALL}")
     print(f"{Fore.YELLOW}Skipped: {skipped}{Style.RESET_ALL}")
 
-    if failed > 0:
-        print("\nFailed examples:")
+    if failed > 0 or timed_out > 0:
+        print("\nFailed or timed out examples:")
         for example, status, runtime, error in results:
-            if status == "ERROR":
-                print(f"{Fore.RED}{example} (Runtime: {runtime:.2f}s){Style.RESET_ALL}")
+            if status in ["ERROR", "TIMEOUT"]:
+                color = Fore.RED if status == "ERROR" else Fore.YELLOW
+                print(f"{color}{example} ({status}, Runtime: {runtime:.2f}s){Style.RESET_ALL}")
                 print(f"  Error: {error}")
 
     average_runtime = sum(runtime for _, _, runtime, _ in results) / len(results)
@@ -186,7 +208,7 @@ def run_all_examples(args):
     if all(status in {"SUCCESS", "CACHED"} for _, status, _, _ in results):
         print(f"\n{Fore.GREEN}All examples were successful.{Style.RESET_ALL}")
     else:
-        print(f"\n{Fore.YELLOW}Some examples did not run successfully. Please review the output above.{Style.RESET_ALL}")
+        print(f"\n{Fore.YELLOW}Some examples did not run successfully or timed out. Please review the output above.{Style.RESET_ALL}")
 
 if __name__ == "__main__":
     args = parse_arguments()

From 900957eda8ea5c97416f0191e433676ded831f3f Mon Sep 17 00:00:00 2001
From: William Guss <carlostnb@gmail.com>
Date: Sat, 12 Oct 2024 17:01:46 -0700
Subject: [PATCH 20/20] poetry lock

---
 poetry.lock | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/poetry.lock b/poetry.lock
index 96fbfc51..a0168b5b 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1225,6 +1225,34 @@ files = [
 dev = ["pre-commit", "tox"]
 testing = ["pytest", "pytest-benchmark"]
 
+[[package]]
+name = "psutil"
+version = "5.9.8"
+description = "Cross-platform lib for process and system monitoring in Python."
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+files = [
+    {file = "psutil-5.9.8-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:26bd09967ae00920df88e0352a91cff1a78f8d69b3ecabbfe733610c0af486c8"},
+    {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:05806de88103b25903dff19bb6692bd2e714ccf9e668d050d144012055cbca73"},
+    {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:611052c4bc70432ec770d5d54f64206aa7203a101ec273a0cd82418c86503bb7"},
+    {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:50187900d73c1381ba1454cf40308c2bf6f34268518b3f36a9b663ca87e65e36"},
+    {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:02615ed8c5ea222323408ceba16c60e99c3f91639b07da6373fb7e6539abc56d"},
+    {file = "psutil-5.9.8-cp27-none-win32.whl", hash = "sha256:36f435891adb138ed3c9e58c6af3e2e6ca9ac2f365efe1f9cfef2794e6c93b4e"},
+    {file = "psutil-5.9.8-cp27-none-win_amd64.whl", hash = "sha256:bd1184ceb3f87651a67b2708d4c3338e9b10c5df903f2e3776b62303b26cb631"},
+    {file = "psutil-5.9.8-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:aee678c8720623dc456fa20659af736241f575d79429a0e5e9cf88ae0605cc81"},
+    {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cb6403ce6d8e047495a701dc7c5bd788add903f8986d523e3e20b98b733e421"},
+    {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d06016f7f8625a1825ba3732081d77c94589dca78b7a3fc072194851e88461a4"},
+    {file = "psutil-5.9.8-cp36-cp36m-win32.whl", hash = "sha256:7d79560ad97af658a0f6adfef8b834b53f64746d45b403f225b85c5c2c140eee"},
+    {file = "psutil-5.9.8-cp36-cp36m-win_amd64.whl", hash = "sha256:27cc40c3493bb10de1be4b3f07cae4c010ce715290a5be22b98493509c6299e2"},
+    {file = "psutil-5.9.8-cp37-abi3-win32.whl", hash = "sha256:bc56c2a1b0d15aa3eaa5a60c9f3f8e3e565303b465dbf57a1b730e7a2b9844e0"},
+    {file = "psutil-5.9.8-cp37-abi3-win_amd64.whl", hash = "sha256:8db4c1b57507eef143a15a6884ca10f7c73876cdf5d51e713151c1236a0e68cf"},
+    {file = "psutil-5.9.8-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8"},
+    {file = "psutil-5.9.8.tar.gz", hash = "sha256:6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c"},
+]
+
+[package.extras]
+test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"]
+
 [[package]]
 name = "pydantic"
 version = "2.9.2"
@@ -2308,4 +2336,4 @@ groq = ["groq"]
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9"
-content-hash = "88d9693896e976135b6bc3ea7d99bfda3a91685d9940236c41c08ea1e57b4ab1"
+content-hash = "6b134c0222bf3403ed779f6dcfee3a2d41aa5cc5a5a4c1919cfb693874885ea6"