feat: Move functionality of granite-common to mellea (#571)

* Fix broken tests

Signed-off-by: Fred Reiss <frreiss@us.ibm.com>

* Update test outputs for upstream bug fix

Signed-off-by: Fred Reiss <frreiss@us.ibm.com>

* Import code from granite-common

Signed-off-by: Fred Reiss <frreiss@us.ibm.com>

---------

Signed-off-by: Fred Reiss <frreiss@us.ibm.com>

Author: frreiss

cli/alora/README_TEMPLATE.jinja

@@ -41,15 +41,15 @@ from mellea.core import Context
 from mellea.backends import Backend
 from mellea.stdlib.components.simple import SimpleComponent
 from mellea.backends.adapters import AdapterMixin
-from mellea.backends.adapters.adapter import CustomGraniteCommonAdapter
+from mellea.backends.adapters.adapter import CustomIntrinsicAdapter
 from mellea.stdlib.components.intrinsic import Intrinsic
 
 
 _INTRINSIC_MODEL_ID = "{{ userid }}/{{ intrinsic_name }}"
 _INTRINSIC_ADAPTER_NAME = "{{ intrinsic_name }}"
 
 
-class {{ intrinsic_name_camelcase }}Adapter(CustomGraniteCommonAdapter):
+class {{ intrinsic_name_camelcase }}Adapter(CustomIntrinsicAdapter):
     def __init__(self, base_model_name: str):
         super().__init__(
             model_id=_INTRINSIC_MODEL_ID,

cli/alora/commands.py

@@ -47,11 +47,13 @@ def alora_upload(
     ),
     intrinsic: bool = typer.Option(
         default=False,
-        help="Formats model upload using granite-intrinsic. An io.yaml file must be provided.",
+        help="True if the uploaded adapter implements an intrinsic. "
+        "If true, the caller must provide an io.yaml file.",
     ),
     io_yaml: str = typer.Option(
         default=None,
-        help="Location of a granite-common io.yaml file. See https://nfulton.org/blog/alora_io_yaml.html",
+        help="Location of the io.yaml file that configures input and output "
+        "processing if the model is invoked as an intrinsic.",
     ),
 ):
     """Upload trained adapter to remote model registry."""
@@ -99,7 +101,8 @@ def alora_add_readme(
     ),
     io_yaml: str = typer.Option(
         default=None,
-        help="Location of a granite-common io.yaml file. See https://nfulton.org/blog/alora_io_yaml.html",
+        help="Location of the io.yaml file that configures input and output "
+        "processing if the model is invoked as an intrinsic.",
     ),
 ):
     """Generate and upload an INTRINSIC_README.md for a trained adapter."""

docs/dev/intrinsics_and_adapters.md

@@ -1,5 +1,5 @@
 # Intrinsics and Adapters
-Note: Mellea currently only supports GraniteCommonAdapters and Intrinsics.
+Note: Mellea currently only supports IntrinsicAdapters and Intrinsics.
 
 ## Basics
 In Mellea, intrinsics are a type of Component that signals one or more of the following to a backend:
@@ -24,7 +24,7 @@ Adapters specify:
 - functions for getting a path to load them
 
 ## Using Intrinsics
-Mellea Intrinsics currently utilize the granite-common package for loading adapters and formatting input/outputs (https://github.com/ibm-granite/granite-common). This means Mellea only allows intrinsics/adapters that follow this pattern.
+Mellea Intrinsics currently use the routines under `mellea.formatters.granite` for loading adapters and formatting input/outputs. This means Mellea only allows intrinsics/adapters that follow this pattern.
 
 ## Needed Future Work
 ### Custom Adapters / Intrinsics

docs/dev/requirement_aLoRA_rerouting.md

@@ -34,13 +34,13 @@ Suppose that the user creates a backend and then adds a generic constraint check
 ```python
 from mellea import start_session
 from mellea.core import Requirement
-from mellea.backends.adapters import GraniteCommonAdapter
+from mellea.backends.adapters import IntrinsicAdapter
 
 m = start_session(
     "huggingface.LocalHFBackend:ibm-granite/granite-4.0-micro")
 
-# By default, the AloraRequirement uses a GraniteCommonAdapter with "requirement_check".
-m.backend.add_adapter(GraniteCommonAdapter("ibm-granite/rag-intrinsics-lib", "requirement_check", base_model_name="granite-4.0-micro"))
+# By default, the AloraRequirement uses a IntrinsicAdapter with "requirement_check".
+m.backend.add_adapter(IntrinsicAdapter("ibm-granite/rag-intrinsics-lib", "requirement_check", base_model_name="granite-4.0-micro"))
 
 m.instruct(
     "Corporate wants you to find the difference between these two strings:\n\naaa\naba")

docs/docs/api/mellea/backends/adapters/adapter.mdx

@@ -106,10 +106,10 @@ Returns the path needed to load the adapter.
 
 <div className="w-full h-px bg-gray-200 dark:bg-gray-700 my-4" />
 
-### <span className="ml-2 inline-flex items-center rounded-full px-2 py-1 text-[0.7rem] font-bold tracking-wide bg-[#4ADE8033]/20 text-[#15803D]">CLASS</span> `GraniteCommonAdapter` <sup><a href="https://github.com/generative-computing/mellea/blob/main/mellea/backends/adapters/adapter.py#L73" target="_blank"><Icon icon="github" style="width: 14px; height: 14px;" /></a></sup>
+### <span className="ml-2 inline-flex items-center rounded-full px-2 py-1 text-[0.7rem] font-bold tracking-wide bg-[#4ADE8033]/20 text-[#15803D]">CLASS</span> `IntrinsicAdapter` <sup><a href="https://github.com/generative-computing/mellea/blob/main/mellea/backends/adapters/adapter.py#L73" target="_blank"><Icon icon="github" style="width: 14px; height: 14px;" /></a></sup>
 
 
-Adapter for intrinsics that utilize the ``granite-common`` library.
+Adapter for intrinsics that use the input and output processing routines in `mellea.formatters.granite.intrinsics`.
 
 
 

docs/docs/dev/intrinsics-and-adapters.mdx

@@ -5,7 +5,7 @@ description: "Developer notes on Intrinsics and Adapters."
 
 # Intrinsics and Adapters
 
-Note: Mellea currently only supports GraniteCommonAdapters and Intrinsics.
+Note: Mellea currently only supports IntrinsicAdapters and Intrinsics.
 
 ## Basics
 In Mellea, intrinsics are a type of Component that signals one or more of the following to a backend:
@@ -30,7 +30,7 @@ Adapters specify:
 - functions for getting a path to load them
 
 ## Using Intrinsics
-Mellea Intrinsics currently utilize the granite-common package for loading adapters and formatting input/outputs (https://github.com/ibm-granite/granite-common). This means Mellea only allows intrinsics/adapters that follow this pattern.
+Mellea Intrinsics currently use the routines under `mellea.formatters.granite` for loading adapters and formatting input/outputs. This means Mellea only allows intrinsics/adapters that follow this pattern.
 
 ## Needed Future Work
 ### Custom Adapters / Intrinsics

docs/docs/dev/requirement-alora-rerouting.mdx

@@ -43,8 +43,8 @@ from mellea.stdlib.requirement import Requirement
 m = start_session(
     "huggingface.LocalHFBackend:ibm-granite/granite-3.2-8b-instruct")
 
-## By default, the AloraRequirement uses a GraniteCommonAdapter with "requirement_check".
-m.backend.add_adapter(GraniteCommonAdapter("ibm-granite/rag-intrinsics-lib", "requirement_check", base_model_name="granite-3.2-8b-instruct"))
+## By default, the AloraRequirement uses a IntrinsicAdapter with "requirement_check".
+m.backend.add_adapter(IntrinsicAdapter("ibm-granite/rag-intrinsics-lib", "requirement_check", base_model_name="granite-3.2-8b-instruct"))
 
 m.instruct(
     "Corporate wants you to find the difference between these two strings:\n\naaa\naba")

docs/examples/aLora/101_example.py

@@ -4,7 +4,7 @@
 import time
 
 from mellea import MelleaSession
-from mellea.backends.adapters.adapter import CustomGraniteCommonAdapter
+from mellea.backends.adapters.adapter import CustomIntrinsicAdapter
 from mellea.backends.cache import SimpleLRUCache
 from mellea.backends.huggingface import LocalHFBackend
 from mellea.core import GenerateLog
@@ -18,7 +18,7 @@
 m = MelleaSession(backend=backend, ctx=ChatContext())
 
 
-class StemboltAdapter(CustomGraniteCommonAdapter):
+class StemboltAdapter(CustomIntrinsicAdapter):
     def __init__(self):
         super().__init__(
             model_id="nfulton/stembolts",

docs/examples/aLora/README.md

@@ -91,9 +91,9 @@ The generator will display the README and ask for confirmation before uploading
 You can now create a new adapter class for this model somewhere in your python project:
 
 ```python
-from mellea.backends.adapters.adapter import CustomGraniteCommonAdapter
+from mellea.backends.adapters.adapter import CustomIntrinsicAdapter
 
-class StemboltAdapter(CustomGraniteCommonAdapter):
+class StemboltAdapter(CustomIntrinsicAdapter):
     def __init__(self, base_model_name:str="granite-4.0-micro"):
         super().__init__(
             model_id="$USERNAME/stembolts", # REPLACE $USERNAME WITH YOUR HUGGINGFACE USERNAME

docs/examples/aLora/stembolts_intrinsic.py

@@ -5,7 +5,7 @@
 import mellea.stdlib.functional as mfuncs
 from mellea.backends import Backend
 from mellea.backends.adapters import AdapterMixin
-from mellea.backends.adapters.adapter import CustomGraniteCommonAdapter
+from mellea.backends.adapters.adapter import CustomIntrinsicAdapter
 from mellea.core import Context
 from mellea.stdlib.components import Message
 from mellea.stdlib.components.intrinsic import Intrinsic
@@ -15,7 +15,7 @@
 _INTRINSIC_ADAPTER_NAME = "stembolts"
 
 
-class StemboltAdapter(CustomGraniteCommonAdapter):
+class StemboltAdapter(CustomIntrinsicAdapter):
     def __init__(self, base_model_name: str):
         super().__init__(
             model_id=_INTRINSIC_MODEL_ID,