refactor: tests/unittests -> tests/unit; tests/api -> tests/integration

tests/unit/server/test_logcat.py

@@ -0,0 +1,88 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the terms described in the LICENSE file in
+# the root directory of this source tree.
+
+import io
+import logging
+import os
+import unittest
+
+from llama_stack import logcat
+
+
+class TestLogcat(unittest.TestCase):
+    def setUp(self):
+        self.original_env = os.environ.get("LLAMA_STACK_LOGGING")
+
+        self.log_output = io.StringIO()
+        self._init_logcat()
+
+    def tearDown(self):
+        if self.original_env is not None:
+            os.environ["LLAMA_STACK_LOGGING"] = self.original_env
+        else:
+            os.environ.pop("LLAMA_STACK_LOGGING", None)
+
+    def _init_logcat(self):
+        logcat.init(default_level=logging.DEBUG)
+        self.handler = logging.StreamHandler(self.log_output)
+        self.handler.setFormatter(logging.Formatter("[%(category)s] %(message)s"))
+        logcat._logger.handlers.clear()
+        logcat._logger.addHandler(self.handler)
+
+    def test_basic_logging(self):
+        logcat.info("server", "Info message")
+        logcat.warning("server", "Warning message")
+        logcat.error("server", "Error message")
+
+        output = self.log_output.getvalue()
+        self.assertIn("[server] Info message", output)
+        self.assertIn("[server] Warning message", output)
+        self.assertIn("[server] Error message", output)
+
+    def test_different_categories(self):
+        # Log messages with different categories
+        logcat.info("server", "Server message")
+        logcat.info("inference", "Inference message")
+        logcat.info("router", "Router message")
+
+        output = self.log_output.getvalue()
+        self.assertIn("[server] Server message", output)
+        self.assertIn("[inference] Inference message", output)
+        self.assertIn("[router] Router message", output)
+
+    def test_env_var_control(self):
+        os.environ["LLAMA_STACK_LOGGING"] = "server=debug;inference=warning"
+        self._init_logcat()
+
+        # These should be visible based on the environment settings
+        logcat.debug("server", "Server debug message")
+        logcat.info("server", "Server info message")
+        logcat.warning("inference", "Inference warning message")
+        logcat.error("inference", "Inference error message")
+
+        # These should be filtered out based on the environment settings
+        logcat.debug("inference", "Inference debug message")
+        logcat.info("inference", "Inference info message")
+
+        output = self.log_output.getvalue()
+        self.assertIn("[server] Server debug message", output)
+        self.assertIn("[server] Server info message", output)
+        self.assertIn("[inference] Inference warning message", output)
+        self.assertIn("[inference] Inference error message", output)
+
+        self.assertNotIn("[inference] Inference debug message", output)
+        self.assertNotIn("[inference] Inference info message", output)
+
+    def test_invalid_category(self):
+        logcat.info("nonexistent", "This message should not be logged")
+
+        # Check that the message was not logged
+        output = self.log_output.getvalue()
+        self.assertNotIn("[nonexistent] This message should not be logged", output)
+
+
+if __name__ == "__main__":
+    unittest.main()

tests/unit/server/test_replace_env_vars.py

@@ -0,0 +1,66 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the terms described in the LICENSE file in
+# the root directory of this source tree.
+
+import os
+import unittest
+
+from llama_stack.distribution.stack import replace_env_vars
+
+
+class TestReplaceEnvVars(unittest.TestCase):
+    def setUp(self):
+        # Clear any existing environment variables we'll use in tests
+        for var in ["TEST_VAR", "EMPTY_VAR", "ZERO_VAR"]:
+            if var in os.environ:
+                del os.environ[var]
+
+        # Set up test environment variables
+        os.environ["TEST_VAR"] = "test_value"
+        os.environ["EMPTY_VAR"] = ""
+        os.environ["ZERO_VAR"] = "0"
+
+    def test_simple_replacement(self):
+        self.assertEqual(replace_env_vars("${env.TEST_VAR}"), "test_value")
+
+    def test_default_value_when_not_set(self):
+        self.assertEqual(replace_env_vars("${env.NOT_SET:default}"), "default")
+
+    def test_default_value_when_set(self):
+        self.assertEqual(replace_env_vars("${env.TEST_VAR:default}"), "test_value")
+
+    def test_default_value_when_empty(self):
+        self.assertEqual(replace_env_vars("${env.EMPTY_VAR:default}"), "default")
+
+    def test_conditional_value_when_set(self):
+        self.assertEqual(replace_env_vars("${env.TEST_VAR+conditional}"), "conditional")
+
+    def test_conditional_value_when_not_set(self):
+        self.assertEqual(replace_env_vars("${env.NOT_SET+conditional}"), "")
+
+    def test_conditional_value_when_empty(self):
+        self.assertEqual(replace_env_vars("${env.EMPTY_VAR+conditional}"), "")
+
+    def test_conditional_value_with_zero(self):
+        self.assertEqual(replace_env_vars("${env.ZERO_VAR+conditional}"), "conditional")
+
+    def test_mixed_syntax(self):
+        self.assertEqual(replace_env_vars("${env.TEST_VAR:default} and ${env.NOT_SET+conditional}"), "test_value and ")
+        self.assertEqual(
+            replace_env_vars("${env.NOT_SET:default} and ${env.TEST_VAR+conditional}"), "default and conditional"
+        )
+
+    def test_nested_structures(self):
+        data = {
+            "key1": "${env.TEST_VAR:default}",
+            "key2": ["${env.NOT_SET:default}", "${env.TEST_VAR+conditional}"],
+            "key3": {"nested": "${env.NOT_SET+conditional}"},
+        }
+        expected = {"key1": "test_value", "key2": ["default", "conditional"], "key3": {"nested": ""}}
+        self.assertEqual(replace_env_vars(data), expected)
+
+
+if __name__ == "__main__":
+    unittest.main()