Merge pull request #80 from trubrics/pydantic

fix for pydantic<2

Author: jeffkayne

requirements.txt

@@ -1,4 +1,4 @@
 requests>=2.28.0
-pydantic>=2.0.0
+pydantic>=1.5
 typer>=0.6.1
 loguru>=0.6.0

trubrics/integrations/streamlit/collect.py

@@ -94,7 +94,7 @@ def st_feedback(
                     else:
                         if success_fail_message:
                             st.success("Feedback saved to Trubrics.")
-                        return feedback.model_dump()
+                        return self._pydantic_to_dict(feedback)
                 else:
                     user_response = Response(**user_response)
                     feedback = Feedback(
@@ -106,15 +106,15 @@ def st_feedback(
                         tags=tags,
                         metadata=metadata,
                     )
-                    return feedback.model_dump()
+                    return self._pydantic_to_dict(feedback)
         elif feedback_type in ("thumbs", "faces"):
 
             def _log_feedback_trubrics(user_response, **kwargs):
                 feedback = self.log_feedback(user_response=user_response, **kwargs)
                 if success_fail_message:
                     if feedback:
                         st.toast("Feedback saved to [Trubrics](https://trubrics.streamlit.app/).", icon="✅")
-                        return feedback.model_dump()
+                        return self._pydantic_to_dict(feedback)
                     else:
                         st.toast("Error in saving feedback to [Trubrics](https://trubrics.streamlit.app/).", icon="❌")
 
@@ -145,12 +145,20 @@ def _log_feedback_trubrics(user_response, **kwargs):
                     tags=tags,
                     metadata=metadata,
                 )
-                return feedback.model_dump()
+                return self._pydantic_to_dict(feedback)
             return user_response
         else:
             raise ValueError("feedback_type must be one of ['textbox', 'faces', 'thumbs'].")
         return None
 
+    @staticmethod
+    def _pydantic_to_dict(feedback: Feedback) -> dict:
+        """Support for pydantic v1 and v2."""
+        try:
+            return feedback.model_dump()
+        except AttributeError:
+            return feedback.dict()
+
     @staticmethod
     def st_textbox_ui(key: Optional[str] = None, label: Optional[str] = None) -> Optional[str]:
         """